From 5f612ab2f67b2c6f6894c624a7780799526d566d Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 05 十一月 2026 20:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillSaveReqVO.java | 74
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/visit/AfterSaleVisitServiceImpl.java | 106
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialStockPageReqVO.java | 30
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java | 62
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardService.java | 220 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyOverviewService.java | 138
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificatePageReqVO.java | 50
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateRespVO.java | 45
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/vo/AfterSaleVisitPageReqVO.java | 27
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyTrainingController.java | 187 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyMaterialCategoryEnum.java | 38
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmTaxRateConfigController.java | 2
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/enums/ExcelErrorCodeConstants.java | 34
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyDrillTypeEnum.java | 33
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/MesWmMiscIssueController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialStockRespVO.java | 38
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyCertificateController.java | 98
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorRespVO.java | 28
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyAccidentLevelEnum.java | 32
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitDO.java | 77
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcQualityExportVO.java | 92
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/MesWmOutsourceReceiptController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyWorkPermitMonitorMapper.java | 28
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/vo/MesQcInspectionLedgerRespVO.java | 102
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/CrmSaleQuotationController.java | 2
yudao-module-mes/src/main/resources/mapper/qc/ledger/MesQcInspectionLedgerMapper.xml | 176 +
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivablePlanController.java | 6
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/LocalDateStringConverter.java | 42
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/SafetyErrorCodeConstants.java | 67
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/meteringcheck/MesDvMeteringCheckController.java | 2
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/visit/AfterSaleVisitDO.java | 67
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/certificate/SrmSupplierCertificateController.java | 2
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/PermissionController.java | 5
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyMaterialController.java | 138
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmEmployeeSocialSecurityController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/maintenanceplan/MesProMaintenancePlanController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionPointDO.java | 47
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/LocalDateTimeStringConverter.java | 39
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyHazardStatusEnum.java | 40
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ledger/SafetyOverviewRespVO.java | 62
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/redis/no/AfterSaleNoRedisDAO.java | 1
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java | 4
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java | 39
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyFileController.java | 53
yudao-module-mes/pom.xml | 7
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcImportRespVO.java | 26
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderBomController.java | 17
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java | 10
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceHolidayController.java | 2
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/BpmProcessDefinitionIdUtils.java | 56
yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/dto/HrmEmployeeSimpleDTO.java | 57
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialStockSaveReqVO.java | 56
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyAccidentDO.java | 64
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyLedgerController.java | 53
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyCertificateMapper.java | 46
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyTrainingDO.java | 50
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/AfterSaleVisitStatusEnum.java | 44
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentSaveReqVO.java | 91
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyHazardSourceEnum.java | 32
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/vo/AfterSaleVisitRespVO.java | 56
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardPageReqVO.java | 48
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ledger/MesQcInspectionLedgerMapper.java | 20
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitSaveReqVO.java | 84
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/visit/AfterSaleVisitService.java | 52
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyCertificateStatusEnum.java | 32
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionRespVO.java | 36
.gitignore | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyDrillMapper.java | 37
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemPageReqVO.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyAccidentMapper.java | 44
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/tm/tool/MesTmToolController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentRespVO.java | 49
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchasePlanController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRespVO.java | 62
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRecheckReqVO.java | 36
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRectifyReqVO.java | 31
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyOrgMapper.java | 34
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialPageReqVO.java | 24
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyAccidentTypeEnum.java | 36
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contract/CrmContractMapper.java | 8
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyInspectionController.java | 162 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ledger/MesQcInspectionLedgerServiceImpl.java | 75
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardSaveReqVO.java | 73
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyTrainingTypeEnum.java | 34
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyInspectionPointMapper.java | 40
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ledger/SafetyLedgerExportReqVO.java | 32
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/vo/AfterSaleVisitCreateReqVO.java | 41
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyPermitTypeEnum.java | 41
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ledger/MesQcInspectionLedgerService.java | 22
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyMaterialStockMapper.java | 29
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSocialSecuritySchemeController.java | 2
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/remind/HrmExpiryRemindServiceImpl.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillRespVO.java | 38
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/metering/MesDvMeteringController.java | 2
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyOrgDO.java | 41
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialRespVO.java | 43
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyHazardDO.java | 82
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueLineServiceImpl.java | 16
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java | 2
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInvoiceController.java | 2
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPageReqVO.java | 30
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/MesWmProductReceiptController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java | 2
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/credit/CrmCreditRatingController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyInspectionService.java | 223 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/vo/MesQcInspectionLedgerPageReqVO.java | 41
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/AfterSaleVisitController.java | 96
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyCertificateService.java | 234 +
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/translate/core/TranslateUtils.java | 6
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java | 12
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointPageReqVO.java | 24
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyFileService.java | 99
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageRecordTypeEnum.java | 1
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitPageReqVO.java | 33
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgSaveReqVO.java | 51
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentPageReqVO.java | 31
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyOrgController.java | 99
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyOrgService.java | 157 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyPermitStatusEnum.java | 35
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyHazardLevelEnum.java | 30
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java | 13
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgRespVO.java | 36
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java | 96
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyCertificateDO.java | 57
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/ImGroupMemberController.java | 7
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/ticket/AfterSaleTicketDO.java | 19
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointRespVO.java | 40
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyInspectionPointTypeEnum.java | 34
yudao-dependencies/pom.xml | 1
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java | 10
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyTrainingService.java | 273 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRefResolver.java | 122
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/ListJsonStringConverter.java | 39
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardAssignReqVO.java | 37
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyMaterialStockDO.java | 48
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/vo/MesQcInspectionLedgerExportVO.java | 70
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingSaveReqVO.java | 71
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/handler/DateAsTextCellWriteHandler.java | 60
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyWorkPermitMapper.java | 37
yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java | 29
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkrecord/MesDvCheckRecordController.java | 2
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/certificate/HrmCertificateController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java | 2
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyInspectCycleEnum.java | 32
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/ticket/vo/ticket/AfterSaleTicketRespVO.java | 12
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyRiskLevelEnum.java | 32
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialSaveReqVO.java | 76
yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApi.java | 42
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyDrillDO.java | 51
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyCertificateTypeEnum.java | 37
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivableController.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/MesWmMiscReceiptController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorSaveReqVO.java | 47
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitRespVO.java | 58
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateSaveReqVO.java | 73
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyMaterialService.java | 192 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/repair/MesDvRepairController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitApproveReqVO.java | 36
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyWorkPermitController.java | 147
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyWorkPermitService.java | 286 +
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/visit/AfterSaleVisitMapper.java | 33
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/equipmentreceipt/MesWmEquipmentReceiptController.java | 2
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyHazardController.java | 106
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitMonitorDO.java | 38
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyTrainingMapper.java | 37
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java | 55
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointSaveReqVO.java | 59
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyAccidentStatusEnum.java | 32
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/outsourcetest/MesQcOutsourceTestController.java | 2
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmProcessDefinitionInfoMapper.java | 13
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingRespVO.java | 38
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/MesWmTransferController.java | 2
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java | 24
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java | 40
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/CrmContactController.java | 10
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyInspectionMapper.java | 51
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/mysql/item/MdmItemMapper.java | 5
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkplan/MesDvCheckPlanController.java | 2
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApiImpl.java | 85
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyLedgerExportService.java | 334 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyMaterialDO.java | 54
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionSaveReqVO.java | 54
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyHazardMapper.java | 49
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingPageReqVO.java | 29
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/LocalTimeStringConverter.java | 41
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyMaterialMapper.java | 57
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/maintenancecalendar/MesProMaintenanceCalendarController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/repair/MesDvRepairMapper.java | 8
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/MesQcInspectionLedgerController.java | 113
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionDO.java | 45
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillPageReqVO.java | 29
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/employee/HrmEmployeeMapper.java | 13
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/maintenrecord/MesDvMaintenRecordController.java | 2
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java | 6
220 files changed, 9,279 insertions(+), 131 deletions(-)
diff --git a/.gitignore b/.gitignore
index 08656fb..4c35ec0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,3 +73,5 @@
.claude/scheduled_tasks.json
/.export_tmp
+# 鏈湴楠岃瘉涓撶敤锛堟湰鍦板簱蹇収涓庤鐩栭厤缃級锛岀粷涓嶅叆搴�
+.local-test/
diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index 8c9a6be..c22c56b 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -606,6 +606,7 @@
<version>${vertx.version}</version>
</dependency>
+
<!-- MQTT -->
<dependency>
<groupId>org.eclipse.paho</groupId>
diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/ListJsonStringConverter.java b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/ListJsonStringConverter.java
new file mode 100644
index 0000000..37a5ebf
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/ListJsonStringConverter.java
@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.framework.excel.core.convert;
+
+import cn.hutool.json.JSONUtil;
+import cn.idev.excel.converters.Converter;
+import cn.idev.excel.enums.CellDataTypeEnum;
+import cn.idev.excel.metadata.GlobalConfiguration;
+import cn.idev.excel.metadata.data.WriteCellData;
+import cn.idev.excel.metadata.property.ExcelContentProperty;
+
+import java.util.List;
+
+/**
+ * List 鍐欏嚭涓� JSON 鏂囨湰鐨勮浆鎹㈠櫒
+ *
+ * <p>FastExcel 鍐呯疆娌℃湁 List 鐨勮浆鎹㈠櫒锛屽鍑哄惈 List 瀛楁鐨� VO 鏃�
+ * 浼氭姏 {@code Can not find 'Converter' support class List}锛屾帴鍙g洿鎺� 500銆�
+ * 鏈浆鎹㈠櫒鎶婇泦鍚堝簭鍒楀寲鎴� JSON 鏂囨湰鍐欏叆鍗曞厓鏍硷紝淇濊瘉瀵煎嚭鍙敤銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public class ListJsonStringConverter implements Converter<List> {
+
+ @Override
+ public Class<List> supportJavaTypeKey() {
+ return List.class;
+ }
+
+ @Override
+ public CellDataTypeEnum supportExcelTypeKey() {
+ return CellDataTypeEnum.STRING;
+ }
+
+ @Override
+ public WriteCellData<?> convertToExcelData(List value, ExcelContentProperty contentProperty,
+ GlobalConfiguration globalConfiguration) {
+ return new WriteCellData<>(JSONUtil.toJsonStr(value));
+ }
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/LocalDateStringConverter.java b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/LocalDateStringConverter.java
new file mode 100644
index 0000000..b63fc82
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/LocalDateStringConverter.java
@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.framework.excel.core.convert;
+
+import cn.idev.excel.converters.Converter;
+import cn.idev.excel.enums.CellDataTypeEnum;
+import cn.idev.excel.metadata.GlobalConfiguration;
+import cn.idev.excel.metadata.data.WriteCellData;
+import cn.idev.excel.metadata.property.ExcelContentProperty;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * LocalDate 鍐欏嚭涓虹函鏂囨湰锛坹yyy-MM-dd锛夌殑杞崲鍣�
+ *
+ * <p>榛樿 FastExcel 鎶婃棩鏈熷啓鎴愩�屾棩鏈熷崟鍏冩牸銆嶏紝鍦� Excel 閲屾樉绀轰负 46023.0 杩欑被搴忓垪鍙凤紝
+ * 浣跨敤鑰呯湅涓嶆噦璇ュ~浠�涔堟牸寮忋�傚鍏ユā鏉跨被鍦烘櫙娉ㄥ唽鏈浆鎹㈠櫒鍚庯紝鏃ユ湡浠ユ枃鏈緭鍑猴紝鐩磋鍙銆�</p>
+ *
+ * <p>娉ㄦ剰锛氫粎鐢ㄤ簬銆屽啓鍑烘ā鏉裤�嶏紝涓嶈鐢ㄤ簬瀵煎叆瑙f瀽銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public class LocalDateStringConverter implements Converter<LocalDate> {
+
+ private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+ @Override
+ public Class<LocalDate> supportJavaTypeKey() {
+ return LocalDate.class;
+ }
+
+ @Override
+ public CellDataTypeEnum supportExcelTypeKey() {
+ return CellDataTypeEnum.STRING;
+ }
+
+ @Override
+ public WriteCellData<?> convertToExcelData(LocalDate value, ExcelContentProperty contentProperty,
+ GlobalConfiguration globalConfiguration) {
+ return new WriteCellData<>(value.format(FORMATTER));
+ }
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/LocalDateTimeStringConverter.java b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/LocalDateTimeStringConverter.java
new file mode 100644
index 0000000..28c9ddb
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/LocalDateTimeStringConverter.java
@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.framework.excel.core.convert;
+
+import cn.idev.excel.converters.Converter;
+import cn.idev.excel.enums.CellDataTypeEnum;
+import cn.idev.excel.metadata.GlobalConfiguration;
+import cn.idev.excel.metadata.data.WriteCellData;
+import cn.idev.excel.metadata.property.ExcelContentProperty;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * LocalDateTime 鍐欏嚭涓虹函鏂囨湰锛坹yyy-MM-dd HH:mm:ss锛夌殑杞崲鍣�
+ *
+ * <p>鐢ㄩ�斿悓 {@link LocalDateStringConverter}锛岄伩鍏嶆椂闂存樉绀轰负 Excel 搴忓垪鍙枫��</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public class LocalDateTimeStringConverter implements Converter<LocalDateTime> {
+
+ private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+ @Override
+ public Class<LocalDateTime> supportJavaTypeKey() {
+ return LocalDateTime.class;
+ }
+
+ @Override
+ public CellDataTypeEnum supportExcelTypeKey() {
+ return CellDataTypeEnum.STRING;
+ }
+
+ @Override
+ public WriteCellData<?> convertToExcelData(LocalDateTime value, ExcelContentProperty contentProperty,
+ GlobalConfiguration globalConfiguration) {
+ return new WriteCellData<>(value.format(FORMATTER));
+ }
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/LocalTimeStringConverter.java b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/LocalTimeStringConverter.java
new file mode 100644
index 0000000..413971f
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/LocalTimeStringConverter.java
@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.framework.excel.core.convert;
+
+import cn.idev.excel.converters.Converter;
+import cn.idev.excel.enums.CellDataTypeEnum;
+import cn.idev.excel.metadata.GlobalConfiguration;
+import cn.idev.excel.metadata.data.WriteCellData;
+import cn.idev.excel.metadata.property.ExcelContentProperty;
+
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * LocalTime 鍐欏嚭涓虹函鏂囨湰锛圚H:mm:ss锛夌殑杞崲鍣�
+ *
+ * <p>FastExcel 鍐呯疆娌℃湁 LocalTime 鐨勮浆鎹㈠櫒锛屽鍑哄惈 LocalTime 瀛楁鐨� VO 鏃�
+ * 浼氭姏 {@code Can not find 'Converter' support class LocalTime}锛屾帴鍙g洿鎺� 500銆�
+ * 娉ㄥ唽鏈浆鎹㈠櫒鍚庡彲姝e父瀵煎嚭銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public class LocalTimeStringConverter implements Converter<LocalTime> {
+
+ private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("HH:mm:ss");
+
+ @Override
+ public Class<LocalTime> supportJavaTypeKey() {
+ return LocalTime.class;
+ }
+
+ @Override
+ public CellDataTypeEnum supportExcelTypeKey() {
+ return CellDataTypeEnum.STRING;
+ }
+
+ @Override
+ public WriteCellData<?> convertToExcelData(LocalTime value, ExcelContentProperty contentProperty,
+ GlobalConfiguration globalConfiguration) {
+ return new WriteCellData<>(value.format(FORMATTER));
+ }
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/enums/ExcelErrorCodeConstants.java b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/enums/ExcelErrorCodeConstants.java
new file mode 100644
index 0000000..309b67c
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/enums/ExcelErrorCodeConstants.java
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.framework.excel.core.enums;
+
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+
+/**
+ * Excel 鐩稿叧鐨勯敊璇爜
+ *
+ * <p>缁熶竴鍦� {@link cn.iocoder.yudao.framework.excel.core.util.ExcelUtils} 涓姏鍑猴紝
+ * 璁╂墍鏈夊鍏ユ帴鍙e湪閬囧埌鍧忔枃浠躲�佹牸寮忎笉瀵广�佹ā鏉夸笉鍖归厤鏃堕兘杩斿洖鍙鐨勪腑鏂囨彁绀猴紝
+ * 鑰屼笉鏄惈绯婄殑銆岀郴缁熷紓甯搞��500銆�</p>
+ *
+ * <p>閿欒鐮佸尯闂达細1_099_000_000 ~ 1_099_999_999锛堟鏋剁骇锛岄伩鍏嶄笌涓氬姟妯″潡鍐茬獊锛�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface ExcelErrorCodeConstants {
+
+ // ========== Excel 鏂囦欢鏈韩鐨勯棶棰� ==========
+
+ ErrorCode EXCEL_FILE_EMPTY = new ErrorCode(1_099_000_001, "璇烽�夋嫨瑕佸鍏ョ殑 Excel 鏂囦欢");
+ ErrorCode EXCEL_FILE_READ_FAILED = new ErrorCode(1_099_000_002, "Excel 鏂囦欢璇诲彇澶辫触锛岃纭鏂囦欢鏈崯鍧忎笖涓� .xls/.xlsx 鏍煎紡");
+ ErrorCode EXCEL_FILE_EMPTY_CONTENT = new ErrorCode(1_099_000_003, "Excel 鍐呭涓虹┖锛岃鎸夌収妯℃澘濉啓鏁版嵁鍚庡啀瀵煎叆");
+
+ // ========== 妯℃澘涓嶅尮閰� ==========
+
+ ErrorCode EXCEL_HEAD_NOT_MATCH = new ErrorCode(1_099_000_010, "Excel 琛ㄥご涓庡鍏ユā鏉夸笉涓�鑷达紝璇蜂笅杞芥渶鏂版ā鏉块噸鏂板~鍐�");
+ ErrorCode EXCEL_TEMPLATE_NOT_MATCH = new ErrorCode(1_099_000_011, "Excel 妯℃澘鐗堟湰杩囨棫鎴栦笉鍖归厤锛岃涓嬭浇鏈�鏂版ā鏉块噸鏂板~鍐�");
+
+ // ========== 鍗曞厓鏍兼暟鎹棶棰� ==========
+
+ ErrorCode EXCEL_DATA_CONVERT_FAILED = new ErrorCode(1_099_000_020, "绗� %d 琛岀 %d 鍒楁暟鎹牸寮忎笉姝g‘锛�%s");
+ ErrorCode EXCEL_DATA_ILLEGAL = new ErrorCode(1_099_000_021, "Excel 鏁版嵁鏍煎紡涓嶆纭紝璇锋鏌ュ~鍐欏唴瀹瑰悗閲嶈瘯");
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/handler/DateAsTextCellWriteHandler.java b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/handler/DateAsTextCellWriteHandler.java
new file mode 100644
index 0000000..d2d35bd
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/handler/DateAsTextCellWriteHandler.java
@@ -0,0 +1,60 @@
+package cn.iocoder.yudao.framework.excel.core.handler;
+
+import cn.idev.excel.write.handler.CellWriteHandler;
+import cn.idev.excel.write.handler.context.CellWriteHandlerContext;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * 鎶婃棩鏈熷崟鍏冩牸寮哄埗鍐欐垚绾枃鏈殑澶勭悊鍣�
+ *
+ * <p>鑳屾櫙锛欶astExcel 鍦ㄥ啓鍑烘椂锛屽嵆浣挎敞鍐屼簡瀛楃涓茶浆鎹㈠櫒锛屾棩鏈熷瓧娈典粛鍙兘琚唴缃殑
+ * Number 杞崲鍣ㄦ帴绠★紝鏈�缁堝湪 Excel 閲屾樉绀轰负 46023.0 杩欑被搴忓垪鍙凤紝浣跨敤鑰呯湅涓嶆噦銆�</p>
+ *
+ * <p>鏈鐞嗗櫒鍦ㄥ崟鍏冩牸鍐欏畬鍚庝粙鍏ワ紝鎶� LocalDate / LocalDateTime 绫诲瀷鐨勫師濮嬪��
+ * 鏍煎紡鍖栦负 yyyy-MM-dd / yyyy-MM-dd HH:mm:ss 骞朵互鏂囨湰鍐欏叆銆�</p>
+ *
+ * <p>浠呯敤浜庛�屼笅杞藉鍏ユā鏉裤�嶏紝涓嶅奖鍝嶅鍏ヨВ鏋愩��</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public class DateAsTextCellWriteHandler implements CellWriteHandler {
+
+ private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ private static final DateTimeFormatter DATETIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+ @Override
+ public void afterCellDispose(CellWriteHandlerContext context) {
+ // 鍙鐞嗘暟鎹锛岃烦杩囪〃澶�
+ if (Boolean.TRUE.equals(context.getHead())) {
+ return;
+ }
+ Object value = context.getOriginalValue();
+ if (value == null) {
+ return;
+ }
+ String text = null;
+ if (value instanceof LocalDate localDate) {
+ text = localDate.format(DATE_FORMATTER);
+ } else if (value instanceof LocalDateTime localDateTime) {
+ text = localDateTime.format(DATETIME_FORMATTER);
+ } else if (value instanceof java.util.Date date) {
+ text = date.toInstant().atZone(java.time.ZoneId.systemDefault())
+ .toLocalDate().format(DATE_FORMATTER);
+ }
+ if (text == null) {
+ return;
+ }
+ Cell cell = context.getCell();
+ if (cell == null) {
+ return;
+ }
+ cell.setCellType(CellType.STRING);
+ cell.setCellValue(text);
+ }
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
index 5d65ac1..91e88c2 100644
--- a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
+++ b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
@@ -1,10 +1,20 @@
package cn.iocoder.yudao.framework.excel.core.util;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.exceptions.ExceptionUtil;
+import cn.hutool.core.util.StrUtil;
import cn.idev.excel.ExcelWriter;
import cn.idev.excel.FastExcelFactory;
import cn.idev.excel.converters.longconverter.LongStringConverter;
+import cn.idev.excel.exception.ExcelAnalysisException;
+import cn.idev.excel.exception.ExcelCommonException;
+import cn.idev.excel.exception.ExcelDataConvertException;
import cn.iocoder.yudao.framework.common.util.http.HttpUtils;
+import cn.iocoder.yudao.framework.excel.core.convert.ListJsonStringConverter;
+import cn.iocoder.yudao.framework.excel.core.convert.LocalTimeStringConverter;
+import lombok.extern.slf4j.Slf4j;
import cn.iocoder.yudao.framework.excel.core.handler.ColumnWidthMatchStyleStrategy;
+import cn.iocoder.yudao.framework.excel.core.handler.DateAsTextCellWriteHandler;
import cn.iocoder.yudao.framework.excel.core.handler.SelectSheetWriteHandler;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.multipart.MultipartFile;
@@ -13,11 +23,15 @@
import java.io.InputStream;
import java.util.List;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.excel.core.enums.ExcelErrorCodeConstants.*;
+
/**
* Excel 宸ュ叿绫�
*
* @author 瓒呯骇绠$悊鍛�
*/
+@Slf4j
public class ExcelUtils {
/**
@@ -39,6 +53,8 @@
.registerWriteHandler(new ColumnWidthMatchStyleStrategy()) // 鍩轰簬 column 闀垮害锛岃嚜鍔ㄩ�傞厤銆傛渶澶� 255 瀹藉害
.registerWriteHandler(new SelectSheetWriteHandler(head)) // 鍩轰簬鍥哄畾 sheet 瀹炵幇涓嬫媺妗�
.registerConverter(new LongStringConverter()) // 閬垮厤 Long 绫诲瀷涓㈠け绮惧害
+ .registerConverter(new LocalTimeStringConverter()) // FastExcel 鍐呯疆鏃� LocalTime锛岀己灏戞椂浼氭姏 Can not find 'Converter'
+ .registerConverter(new ListJsonStringConverter()) // FastExcel 鍐呯疆鏃� List锛岀己灏戞椂浼氭姏 Can not find 'Converter'
.build();
try {
excelWriter.write(data, FastExcelFactory.writerSheet(sheetName).build());
@@ -55,13 +71,89 @@
response.setContentType("application/vnd.ms-excel;charset=UTF-8");
}
- public static <T> List<T> read(MultipartFile file, Class<T> head) throws IOException {
+ /**
+ * 杈撳嚭 Excel 妯℃澘锛堟棩鏈熸寜鏂囨湰娓叉煋锛�
+ *
+ * <p>涓� {@link #write} 鐨勫尯鍒細棰濆娉ㄥ唽浜� {@link DateAsTextCellWriteHandler}锛�
+ * 鎶� LocalDate / LocalDateTime 鍐欐垚 yyyy-MM-dd 鏂囨湰锛岃�屼笉鏄� Excel 鏃ユ湡搴忓垪鍙枫��
+ * 浠呯敤浜庛�屼笅杞藉鍏ユā鏉裤�嶏紝瀵煎叆瑙f瀽浠嶈蛋 {@link #read}锛屼笉鍙楀奖鍝嶃��</p>
+ */
+ public static <T> void writeTemplate(HttpServletResponse response, String filename, String sheetName,
+ Class<T> head, List<T> data) throws IOException {
+ ExcelWriter excelWriter = FastExcelFactory.write(response.getOutputStream(), head)
+ .autoCloseStream(false)
+ .registerWriteHandler(new ColumnWidthMatchStyleStrategy())
+ .registerWriteHandler(new SelectSheetWriteHandler(head))
+ .registerWriteHandler(new DateAsTextCellWriteHandler())
+ .registerConverter(new LongStringConverter())
+ .registerConverter(new LocalTimeStringConverter())
+ .registerConverter(new ListJsonStringConverter())
+ .build();
+ try {
+ excelWriter.write(data, FastExcelFactory.writerSheet(sheetName).build());
+ } finally {
+ excelWriter.finish();
+ excelWriter.close();
+ }
+ response.addHeader("Content-Disposition", "attachment;filename=" + HttpUtils.encodeUtf8(filename));
+ response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+ }
+
+ /**
+ * 璇诲彇 Excel 鏂囦欢
+ *
+ * <p>鎵�鏈夊鍏ユ帴鍙i兘缁忚繃杩欓噷锛屽洜姝ゅ湪杩欓噷缁熶竴鎶娿�屽潖鏂囦欢 / 绌烘枃浠� / 妯℃澘涓嶅尮閰� / 鍗曞厓鏍兼牸寮忛敊銆�
+ * 绛夊悇绉嶅簳灞傚紓甯革紝杞崲鎴愬彲璇荤殑涓枃鎻愮ず锛圫erviceException锛夈��
+ * 杩欐牱涓氬姟鎺ュ彛涓嶅繀鍚勮嚜鍐� try-catch锛屼篃涓嶄細鍐嶅嚭鐜板惈绯婄殑銆岀郴缁熷紓甯搞��500銆�</p>
+ *
+ * @param file Excel 鏂囦欢
+ * @param head 琛ㄥご瀵瑰簲鐨� VO 绫�
+ * @return 瑙f瀽缁撴灉
+ */
+ public static <T> List<T> read(MultipartFile file, Class<T> head) {
+ // 1. 鏂囦欢鏈韩涓虹┖
+ if (file == null || file.isEmpty()) {
+ throw exception(EXCEL_FILE_EMPTY);
+ }
+ // 2. 瑙f瀽锛堥�愮被璇嗗埆寮傚父锛岀粰鍑哄彲璇绘彁绀猴級
+ List<T> list;
// 鍙傝�� https://t.zsxq.com/zM77F 甯栧瓙锛屽鍔� try 澶勭悊锛屽吋瀹� windows 鍦烘櫙
try (InputStream inputStream = file.getInputStream()) {
- return FastExcelFactory.read(inputStream, head, null)
+ list = FastExcelFactory.read(inputStream, head, null)
.autoCloseStream(false) // 涓嶈鑷姩鍏抽棴锛屼氦缁� Servlet 鑷繁澶勭悊
.doReadAllSync();
+ } catch (IOException ex) {
+ log.warn("[read][Excel 鏂囦欢璇诲彇澶辫触锛屾枃浠跺悕({})]", file.getOriginalFilename(), ex);
+ throw exception(EXCEL_FILE_READ_FAILED);
+ } catch (ExcelDataConvertException ex) {
+ // 鍗曞厓鏍兼暟鎹牸寮忎笉瀵癸紝渚嬪鏂囨湰鍒楀~浜嗘暟瀛椼�佹棩鏈熷垪濉簡涔辩爜
+ String detail = StrUtil.blankToDefault(ex.getMessage(), "鍐呭涓庡垪绫诲瀷涓嶅尮閰�");
+ log.warn("[read][Excel 鍗曞厓鏍兼暟鎹牸寮忛敊璇紝琛�({}) 鍒�({})]", ex.getRowIndex(), ex.getColumnIndex(), ex);
+ throw exception(EXCEL_DATA_CONVERT_FAILED,
+ (ex.getRowIndex() == null ? 0 : ex.getRowIndex()) + 1,
+ (ex.getColumnIndex() == null ? 0 : ex.getColumnIndex()) + 1,
+ StrUtil.maxLength(detail, 60));
+ } catch (ExcelAnalysisException ex) {
+ // 鏂囦欢鎹熷潖銆佸姞瀵嗐�佷笉鏄湡姝g殑 Excel銆佽〃澶翠笌妯℃澘瀵逛笉涓婄瓑
+ String rootMsg = StrUtil.blankToDefault(ExceptionUtil.getRootCauseMessage(ex), "");
+ log.warn("[read][Excel 瑙f瀽澶辫触锛屾枃浠跺悕({})锛屽師鍥�({})]", file.getOriginalFilename(), rootMsg, ex);
+ if (StrUtil.containsAnyIgnoreCase(rootMsg, "head", "Can not find", "autoTrim", "Convert")) {
+ throw exception(EXCEL_HEAD_NOT_MATCH);
+ }
+ throw exception(EXCEL_TEMPLATE_NOT_MATCH);
+ } catch (ExcelCommonException ex) {
+ log.warn("[read][Excel 閫氱敤寮傚父锛屾枃浠跺悕({})]", file.getOriginalFilename(), ex);
+ throw exception(EXCEL_FILE_READ_FAILED);
+ } catch (Exception ex) {
+ // 鍏滃簳锛氫换浣曟湭棰勬枡鐨勮В鏋愬紓甯搁兘杞垚鍙鎻愮ず锛岄伩鍏嶇洿鎺� 500銆岀郴缁熷紓甯搞��
+ log.warn("[read][Excel 瑙f瀽鍑虹幇鏈鏈熷紓甯革紝鏂囦欢鍚�({})]", file.getOriginalFilename(), ex);
+ throw exception(EXCEL_FILE_READ_FAILED);
}
+ // 3. 瑙f瀽鍑烘潵鏄┖琛紙鍙湁琛ㄥご銆佹病鏈夋暟鎹锛�
+ if (CollUtil.isEmpty(list)) {
+ throw exception(EXCEL_FILE_EMPTY_CONTENT);
+ }
+ return list;
}
}
diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/translate/core/TranslateUtils.java b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/translate/core/TranslateUtils.java
index 127e7c4..959b587 100644
--- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/translate/core/TranslateUtils.java
+++ b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/translate/core/TranslateUtils.java
@@ -28,7 +28,11 @@
* @return 缈昏瘧缁撴灉
*/
public static <T extends VO> List<T> translate(List<T> data) {
- if (CollUtil.isNotEmpty((data))) {
+ // transService 鐢� TranslateConfig 鍦� easy-trans 鍙敤鏃舵敞鍏ワ紱
+ // Spring Boot 4 涓� easy-trans 鑷姩閰嶇疆琚鐢紙瑙佸悇 profile 鐨� spring.autoconfigure.exclude锛夛紝
+ // 姝ゆ椂 transService 涓� null銆傜炕璇戝彧鏄寮哄睍绀猴紝缂哄け鏃剁洿鎺ヨ繑鍥炲師鏁版嵁锛�
+ // 涓嶈兘璁╁鍑虹被鎺ュ彛鍥犱负缈昏瘧缁勪欢涓嶅彲鐢ㄨ�屾姏 NPE 鍙樻垚 500銆�
+ if (transService != null && CollUtil.isNotEmpty((data))) {
transService.transBatch(data);
}
return data;
diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
index 0eb7f5e..ab16966 100644
--- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
@@ -36,8 +36,10 @@
import org.springframework.web.bind.annotation.RestControllerAdvice;
import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
import org.springframework.web.multipart.MaxUploadSizeExceededException;
+import org.springframework.web.multipart.MultipartException;
import org.springframework.web.servlet.NoHandlerFoundException;
import org.springframework.web.servlet.resource.NoResourceFoundException;
+import org.springdoc.api.OpenApiResourceNotFoundException;
import tools.jackson.databind.exc.InvalidFormatException;
import java.time.LocalDateTime;
@@ -97,11 +99,20 @@
if (ex instanceof MaxUploadSizeExceededException) {
return maxUploadSizeExceededExceptionHandler((MaxUploadSizeExceededException) ex);
}
+ // 涓婁紶绫绘帴鍙f敹鍒伴潪 multipart 璇锋眰锛堝墠绔紡浼犳枃浠� / 鐢� JSON 璋冪敤浜嗗鍏ユ帴鍙o級灞炰簬瀹㈡埛绔棶棰橈紝涓嶅簲鎸� 500 澶勭悊
+ if (ex instanceof MultipartException) {
+ return multipartExceptionHandler((MultipartException) ex);
+ }
if (ex instanceof NoHandlerFoundException) {
return noHandlerFoundExceptionHandler((NoHandlerFoundException) ex);
}
if (ex instanceof NoResourceFoundException) {
return noResourceFoundExceptionHandler(request, (NoResourceFoundException) ex);
+ }
+ // /v3/api-docs/{group} 浼犲叆涓嶅瓨鍦ㄧ殑鍒嗙粍锛氬睘浜庤祫婧愪笉瀛樺湪锛屽簲杩斿洖 404 鑰屼笉鏄� 500
+ if (ex instanceof OpenApiResourceNotFoundException) {
+ log.warn("[openApiResourceNotFoundExceptionHandler][{}]", ex.getMessage());
+ return CommonResult.error(NOT_FOUND.getCode(), "鎺ュ彛鍒嗙粍涓嶅瓨鍦�: " + ex.getMessage());
}
if (ex instanceof HttpRequestMethodNotSupportedException) {
return httpRequestMethodNotSupportedExceptionHandler((HttpRequestMethodNotSupportedException) ex);
@@ -181,6 +192,18 @@
*
* 渚嬪璇达紝鎺ュ彛涓婅缃簡 @RequestBody 瀹炰綋涓� xx 灞炴�х被鍨嬩负 Integer锛岀粨鏋滀紶閫� xx 鍙傛暟绫诲瀷涓� String
*/
+ /**
+ * 澶勭悊鏂囦欢涓婁紶鎺ュ彛鏀跺埌闈� multipart 璇锋眰
+ *
+ * <p>渚嬪璇达紝Excel 瀵煎叆鎺ュ彛婕忎紶 file 瀛楁銆佹垨鍓嶇鐢� application/json 璋冪敤浜嗗鍏ユ帴鍙c��
+ * 杩欑被閮芥槸瀹㈡埛绔敤娉曢棶棰橈紝杩斿洖 400 鏄庣‘鎻愮ず锛岃�屼笉鏄� 500銆岀郴缁熷紓甯搞�嶃��</p>
+ */
+ @ExceptionHandler(MultipartException.class)
+ public CommonResult<?> multipartExceptionHandler(MultipartException ex) {
+ log.warn("[multipartExceptionHandler]", ex);
+ return CommonResult.error(BAD_REQUEST.getCode(), "璇锋眰鍙傛暟涓嶆纭�:璇蜂娇鐢� multipart/form-data 涓婁紶鏂囦欢");
+ }
+
@ExceptionHandler(HttpMessageNotReadableException.class)
@SuppressWarnings("PatternVariableCanBeUsed")
public CommonResult<?> methodArgumentTypeInvalidFormatExceptionHandler(HttpMessageNotReadableException ex) {
@@ -192,7 +215,9 @@
if (StrUtil.startWith(ex.getMessage(), "Required request body is missing")) {
return CommonResult.error(BAD_REQUEST.getCode(), "璇锋眰鍙傛暟绫诲瀷閿欒: request body 缂哄け");
}
- return defaultExceptionHandler(ServletUtils.getRequest(), ex);
+ // 鍏跺畠鍙嶅簭鍒楀寲澶辫触锛堝鎶婂璞′紶鎴愭暟缁勩�佸瓧娈电被鍨嬩笉鍖归厤锛夊悓鏍锋槸瀹㈡埛绔姤鏂囬棶棰橈紝涓嶅簲鎸� 500 澶勭悊
+ return CommonResult.error(BAD_REQUEST.getCode(),
+ String.format("璇锋眰鍙傛暟绫诲瀷閿欒:%s", StrUtil.maxLength(ex.getMessage(), 120)));
}
/**
@@ -358,27 +383,31 @@
errorLog.setUserType(WebFrameworkUtils.getLoginUserType(request));
// 璁剧疆寮傚父瀛楁
errorLog.setExceptionName(e.getClass().getName());
- errorLog.setExceptionMessage(ExceptionUtil.getMessage(e));
- errorLog.setExceptionRootCauseMessage(ExceptionUtil.getRootCauseMessage(e));
- errorLog.setExceptionStackTrace(ExceptionUtil.stacktraceToString(e));
+ // infra_api_error_log 鐨勮繖浜涘垪閮芥槸 NOT NULL锛涜�� MyBatis-Plus 鎻掑叆鏃朵細璺宠繃 null 瀛楁锛�
+ // 浜庢槸浠讳竴瀛楁涓� null 閮戒細鍙樻垚 "Field 'xxx' doesn't have a default value"锛屽紓甯告棩蹇楀弽鑰岃涓嶄笅鏉�
+ errorLog.setExceptionMessage(StrUtil.nullToEmpty(ExceptionUtil.getMessage(e)));
+ errorLog.setExceptionRootCauseMessage(StrUtil.nullToEmpty(ExceptionUtil.getRootCauseMessage(e)));
+ errorLog.setExceptionStackTrace(StrUtil.nullToEmpty(ExceptionUtil.stacktraceToString(e)));
StackTraceElement[] stackTraceElements = e.getStackTrace();
Assert.notEmpty(stackTraceElements, "寮傚父 stackTraceElements 涓嶈兘涓虹┖");
StackTraceElement stackTraceElement = stackTraceElements[0];
errorLog.setExceptionClassName(stackTraceElement.getClassName());
- errorLog.setExceptionFileName(stackTraceElement.getFileName());
- errorLog.setExceptionMethodName(stackTraceElement.getMethodName());
+ // 鏍堥《鍏冪礌鍙兘鏄� native 鏂规硶鎴� Lambda锛実etFileName() 涓� null锛�
+ // infra_api_error_log 鐨勮繖浜涘垪鏄� NOT NULL锛屼负 null 浼氬鑷村紓甯告棩蹇楁彃鍏ュけ璐�
+ errorLog.setExceptionFileName(StrUtil.nullToEmpty(stackTraceElement.getFileName()));
+ errorLog.setExceptionMethodName(StrUtil.nullToEmpty(stackTraceElement.getMethodName()));
errorLog.setExceptionLineNumber(stackTraceElement.getLineNumber());
// 璁剧疆鍏跺畠瀛楁
- errorLog.setTraceId(TracerUtils.getTraceId());
- errorLog.setApplicationName(applicationName);
- errorLog.setRequestUrl(request.getRequestURI());
+ errorLog.setTraceId(StrUtil.nullToEmpty(TracerUtils.getTraceId()));
+ errorLog.setApplicationName(StrUtil.nullToEmpty(applicationName));
+ errorLog.setRequestUrl(StrUtil.nullToEmpty(request.getRequestURI()));
Map<String, Object> requestParams = MapUtil.<String, Object>builder()
.put("query", ServletUtils.getParamMap(request))
.put("body", ServletUtils.getBody(request)).build();
- errorLog.setRequestParams(JsonUtils.toJsonString(requestParams));
- errorLog.setRequestMethod(request.getMethod());
- errorLog.setUserAgent(ServletUtils.getUserAgent(request));
- errorLog.setUserIp(ServletUtils.getClientIP(request));
+ errorLog.setRequestParams(StrUtil.nullToEmpty(JsonUtils.toJsonString(requestParams)));
+ errorLog.setRequestMethod(StrUtil.nullToEmpty(request.getMethod()));
+ errorLog.setUserAgent(StrUtil.nullToEmpty(ServletUtils.getUserAgent(request)));
+ errorLog.setUserIp(StrUtil.nullToEmpty(ServletUtils.getClientIP(request)));
errorLog.setExceptionTime(LocalDateTime.now());
}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/ticket/vo/ticket/AfterSaleTicketRespVO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/ticket/vo/ticket/AfterSaleTicketRespVO.java
index f8031a1..990dddf 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/ticket/vo/ticket/AfterSaleTicketRespVO.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/ticket/vo/ticket/AfterSaleTicketRespVO.java
@@ -87,6 +87,18 @@
@Schema(description = "鍏抽棴鏃堕棿")
private LocalDateTime closedTime;
+ @Schema(description = "鍥炶鐘舵�侊細0-寰呭洖璁� 1-宸插洖璁块�氳繃", example = "0")
+ private Integer visitStatus;
+
+ @Schema(description = "鏈�鍚庡洖璁挎椂闂�")
+ private LocalDateTime lastVisitTime;
+
+ @Schema(description = "鏈�鍚庡洖璁挎槸鍚︽弧鎰�")
+ private Boolean lastVisitSatisfied;
+
+ @Schema(description = "鏈�鍚庡洖璁挎槸鍚﹀鍙�")
+ private Boolean lastVisitRecurred;
+
@Schema(description = "澶囨敞")
private String remark;
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/AfterSaleVisitController.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/AfterSaleVisitController.java
new file mode 100644
index 0000000..e168ea8
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/AfterSaleVisitController.java
@@ -0,0 +1,96 @@
+package cn.iocoder.yudao.module.aftersales.controller.admin.visit;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.aftersales.controller.admin.visit.vo.AfterSaleVisitCreateReqVO;
+import cn.iocoder.yudao.module.aftersales.controller.admin.visit.vo.AfterSaleVisitPageReqVO;
+import cn.iocoder.yudao.module.aftersales.controller.admin.visit.vo.AfterSaleVisitRespVO;
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.visit.AfterSaleVisitDO;
+import cn.iocoder.yudao.module.aftersales.service.visit.AfterSaleVisitService;
+import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+
+@Tag(name = "绠$悊鍚庡彴 - 鍞悗鍥炶璁板綍")
+@RestController
+@RequestMapping("/aftersales/visit")
+@Validated
+public class AfterSaleVisitController {
+
+ @Resource
+ private AfterSaleVisitService visitService;
+
+ @Resource
+ private AdminUserApi adminUserApi;
+ @Resource
+ private StorageAttachmentApi storageAttachmentApi;
+
+ @PostMapping("/create")
+ @Operation(summary = "鐧昏鍞悗鍥炶")
+ @PreAuthorize("@ss.hasPermission('aftersales:visit:create')")
+ public CommonResult<Long> createVisit(@Valid @RequestBody AfterSaleVisitCreateReqVO createReqVO) {
+ return success(visitService.createVisit(createReqVO, getLoginUserId()));
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱鍞悗鍥炶璁板綍")
+ @Parameter(name = "id", description = "鍥炶璁板綍缂栧彿", required = true, example = "1")
+ @PreAuthorize("@ss.hasPermission('aftersales:visit:query')")
+ public CommonResult<AfterSaleVisitRespVO> getVisit(@RequestParam("id") Long id) {
+ AfterSaleVisitDO visitDO = visitService.getVisit(id);
+ AfterSaleVisitRespVO respVO = buildVisitDetailList(List.of(visitDO)).get(0);
+ respVO.setAttachmentList(storageAttachmentApi.listAttachments("aftersales_after_sale_visit", id));
+ return success(respVO);
+ }
+
+ @GetMapping("/list")
+ @Operation(summary = "鑾峰緱鏌愬伐鍗曠殑鍥炶璁板綍鍒楄〃")
+ @Parameter(name = "ticketId", description = "宸ュ崟缂栧彿", required = true, example = "1")
+ @PreAuthorize("@ss.hasPermission('aftersales:visit:query')")
+ public CommonResult<List<AfterSaleVisitRespVO>> getVisitListByTicketId(@RequestParam("ticketId") Long ticketId) {
+ List<AfterSaleVisitDO> visitList = visitService.getVisitListByTicketId(ticketId);
+ return success(buildVisitDetailList(visitList));
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱鍞悗鍥炶璁板綍鍒嗛〉")
+ @PreAuthorize("@ss.hasPermission('aftersales:visit:query')")
+ public CommonResult<PageResult<AfterSaleVisitRespVO>> getVisitPage(@Valid AfterSaleVisitPageReqVO pageReqVO) {
+ PageResult<AfterSaleVisitDO> pageResult = visitService.getVisitPage(pageReqVO);
+ return success(new PageResult<>(buildVisitDetailList(pageResult.getList()), pageResult.getTotal()));
+ }
+
+ // ========== 鍐呴儴鏂规硶锛氭壒閲忔嫾瑁呭叧鑱斿悕绉� ==========
+
+ private List<AfterSaleVisitRespVO> buildVisitDetailList(List<AfterSaleVisitDO> visitList) {
+ if (CollUtil.isEmpty(visitList)) {
+ return Collections.emptyList();
+ }
+ // 鎵归噺鍔犺浇鍥炶浜哄悕绉�
+ Set<Long> userIds = convertSet(visitList, AfterSaleVisitDO::getVisitorUserId);
+ Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds);
+ return BeanUtils.toBean(visitList, AfterSaleVisitRespVO.class, vo -> {
+ AdminUserRespDTO visitorUser = userMap.get(vo.getVisitorUserId());
+ if (visitorUser != null) {
+ vo.setVisitorUserName(visitorUser.getNickname());
+ }
+ });
+ }
+
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/vo/AfterSaleVisitCreateReqVO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/vo/AfterSaleVisitCreateReqVO.java
new file mode 100644
index 0000000..423fc34
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/vo/AfterSaleVisitCreateReqVO.java
@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.module.aftersales.controller.admin.visit.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鍞悗鍥炶璁板綍 - 鐧昏 Request VO
+ */
+@Schema(description = "鍞悗鍥炶璁板綍 - 鐧昏 Request VO")
+@Data
+public class AfterSaleVisitCreateReqVO {
+
+ @Schema(description = "宸ュ崟缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "宸ュ崟涓嶈兘涓虹┖")
+ private Long ticketId;
+
+ @Schema(description = "鍥炶鏂瑰紡: 0-鐢佃瘽 1-涓婇棬 2-杩滅▼ 3-鍏朵粬", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
+ @NotNull(message = "鍥炶鏂瑰紡涓嶈兘涓虹┖")
+ private Integer visitType;
+
+ @Schema(description = "鍥炶鍐呭", example = "瀹㈡埛鍙嶉宸叉甯镐娇鐢�")
+ private String content;
+
+ @Schema(description = "鏄惁婊℃剰", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
+ @NotNull(message = "鏄惁婊℃剰涓嶈兘涓虹┖")
+ private Boolean satisfied;
+
+ @Schema(description = "闂鏄惁澶嶅彂", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
+ @NotNull(message = "闂鏄惁澶嶅彂涓嶈兘涓虹┖")
+ private Boolean recurred;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ @Schema(description = "闄勪欢 blobId 鍒楄〃")
+ private List<Long> blobIds;
+
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/vo/AfterSaleVisitPageReqVO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/vo/AfterSaleVisitPageReqVO.java
new file mode 100644
index 0000000..627cf22
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/vo/AfterSaleVisitPageReqVO.java
@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.aftersales.controller.admin.visit.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * 鍞悗鍥炶璁板綍 - 鍒嗛〉鏌ヨ Request VO
+ */
+@Schema(description = "鍞悗鍥炶璁板綍 - 鍒嗛〉鏌ヨ Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class AfterSaleVisitPageReqVO extends PageParam {
+
+ @Schema(description = "宸ュ崟缂栧彿", example = "1")
+ private Long ticketId;
+
+ @Schema(description = "鍥炶鏂瑰紡", example = "0")
+ private Integer visitType;
+
+ @Schema(description = "鏄惁婊℃剰", example = "true")
+ private Boolean satisfied;
+
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/vo/AfterSaleVisitRespVO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/vo/AfterSaleVisitRespVO.java
new file mode 100644
index 0000000..9299605
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/vo/AfterSaleVisitRespVO.java
@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.aftersales.controller.admin.visit.vo;
+
+import cn.iocoder.yudao.module.system.api.storage.dto.StorageBlobRespDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 鍞悗鍥炶璁板綍 - 鍝嶅簲 VO
+ */
+@Schema(description = "鍞悗鍥炶璁板綍 - 鍝嶅簲 VO")
+@Data
+public class AfterSaleVisitRespVO {
+
+ @Schema(description = "鍥炶璁板綍缂栧彿", example = "1")
+ private Long id;
+
+ @Schema(description = "宸ュ崟缂栧彿", example = "1")
+ private Long ticketId;
+
+ @Schema(description = "鍥炶鏂瑰紡: 0-鐢佃瘽 1-涓婇棬 2-杩滅▼ 3-鍏朵粬", example = "0")
+ private Integer visitType;
+
+ @Schema(description = "鍥炶浜虹敤鎴风紪鍙�", example = "1")
+ private Long visitorUserId;
+
+ @Schema(description = "鍥炶浜哄悕绉�")
+ private String visitorUserName;
+
+ @Schema(description = "鍥炶鍐呭")
+ private String content;
+
+ @Schema(description = "鏄惁婊℃剰", example = "true")
+ private Boolean satisfied;
+
+ @Schema(description = "闂鏄惁澶嶅彂", example = "false")
+ private Boolean recurred;
+
+ @Schema(description = "鍥炶鏃堕棿")
+ private LocalDateTime visitTime;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ @Schema(description = "鍒涘缓鑰�")
+ private String creator;
+
+ @Schema(description = "鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+ @Schema(description = "闄勪欢鍒楄〃")
+ private List<StorageBlobRespDTO> attachmentList;
+
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/ticket/AfterSaleTicketDO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/ticket/AfterSaleTicketDO.java
index a2eee67..ac6a29c 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/ticket/AfterSaleTicketDO.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/ticket/AfterSaleTicketDO.java
@@ -112,5 +112,22 @@
* 澶囨敞
*/
private String remark;
-
+ /**
+ * 鍥炶鐘舵��
+ *
+ * 鏋氫妇 {@link cn.iocoder.yudao.module.aftersales.enums.AfterSaleVisitStatusEnum}
+ */
+ private Integer visitStatus;
+ /**
+ * 鏈�鍚庡洖璁挎椂闂�
+ */
+ private LocalDateTime lastVisitTime;
+ /**
+ * 鏈�鍚庡洖璁挎槸鍚︽弧鎰�
+ */
+ private Boolean lastVisitSatisfied;
+ /**
+ * 鏈�鍚庡洖璁挎槸鍚﹀鍙�
+ */
+ private Boolean lastVisitRecurred;
}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/visit/AfterSaleVisitDO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/visit/AfterSaleVisitDO.java
new file mode 100644
index 0000000..87b5363
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/visit/AfterSaleVisitDO.java
@@ -0,0 +1,67 @@
+package cn.iocoder.yudao.module.aftersales.dal.dataobject.visit;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+/**
+ * 鍞悗鍥炶璁板綍 DO
+ * <p>
+ * 鎸傚湪鍞悗宸ュ崟涓嬬殑鍥炶瀛愯褰曪紝鍙鏉★紱鐧昏鍥炶鏃跺悓姝ユ帹杩涘伐鍗曞洖璁跨姸鎬併��
+ */
+@TableName("after_sale_visit")
+@KeySequence("after_sale_visit_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AfterSaleVisitDO extends BaseDO {
+
+ /**
+ * 鍥炶璁板綍缂栧彿
+ */
+ @TableId
+ private Long id;
+ /**
+ * 宸ュ崟缂栧彿锛屽叧鑱� after_sale_ticket.id
+ */
+ private Long ticketId;
+ /**
+ * 鍥炶鏂瑰紡: 0-鐢佃瘽 1-涓婇棬 2-杩滅▼ 3-鍏朵粬
+ */
+ private Integer visitType;
+ /**
+ * 鍥炶浜虹敤鎴风紪鍙�
+ */
+ private Long visitorUserId;
+ /**
+ * 鍥炶鍐呭
+ */
+ private String content;
+ /**
+ * 鏄惁婊℃剰: 0-鍚� 1-鏄�
+ */
+ @TableField("is_satisfied")
+ private Boolean satisfied;
+ /**
+ * 闂鏄惁澶嶅彂: 0-鍚� 1-鏄�
+ */
+ @TableField("is_recurred")
+ private Boolean recurred;
+ /**
+ * 鍥炶鏃堕棿(鐧昏鍗冲綋鏃�)
+ */
+ private LocalDateTime visitTime;
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/visit/AfterSaleVisitMapper.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/visit/AfterSaleVisitMapper.java
new file mode 100644
index 0000000..060adcb
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/visit/AfterSaleVisitMapper.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.aftersales.dal.mysql.visit;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.visit.AfterSaleVisitDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 鍞悗鍥炶璁板綍 Mapper
+ */
+@Mapper
+public interface AfterSaleVisitMapper extends BaseMapperX<AfterSaleVisitDO> {
+
+ default List<AfterSaleVisitDO> selectListByTicketId(Long ticketId) {
+ return selectList(new LambdaQueryWrapperX<AfterSaleVisitDO>()
+ .eq(AfterSaleVisitDO::getTicketId, ticketId)
+ .orderByDesc(AfterSaleVisitDO::getVisitTime));
+ }
+
+ default PageResult<AfterSaleVisitDO> selectPage(PageParam pageParam, Long ticketId, Integer visitType,
+ Boolean satisfied) {
+ return selectPage(pageParam, new LambdaQueryWrapperX<AfterSaleVisitDO>()
+ .eqIfPresent(AfterSaleVisitDO::getTicketId, ticketId)
+ .eqIfPresent(AfterSaleVisitDO::getVisitType, visitType)
+ .eqIfPresent(AfterSaleVisitDO::getSatisfied, satisfied)
+ .orderByDesc(AfterSaleVisitDO::getVisitTime));
+ }
+
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/redis/no/AfterSaleNoRedisDAO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/redis/no/AfterSaleNoRedisDAO.java
index 856c862..28f23bc 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/redis/no/AfterSaleNoRedisDAO.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/redis/no/AfterSaleNoRedisDAO.java
@@ -26,6 +26,7 @@
*/
public static final String RETURN_NO_PREFIX = "RT";
+
@Resource
private StringRedisTemplate stringRedisTemplate;
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/AfterSaleVisitStatusEnum.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/AfterSaleVisitStatusEnum.java
new file mode 100644
index 0000000..8c08872
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/AfterSaleVisitStatusEnum.java
@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.aftersales.enums;
+
+import cn.iocoder.yudao.framework.common.core.ArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 鍞悗宸ュ崟鍥炶鐘舵�佹灇涓�
+ * <p>
+ * 宸ュ崟瀹岀粨(COMPLETED)鍚庤繘鍏ャ�屽緟鍥炶銆嶏紱鐧昏銆屾弧鎰忎笖鏈鍙戙�嶇殑鍥炶鍚庣疆涓恒�屽凡鍥炶閫氳繃銆嶏紝鏂瑰彲褰掓。銆�
+ */
+@Getter
+@AllArgsConstructor
+public enum AfterSaleVisitStatusEnum implements ArrayValuable<Integer> {
+
+ WAITING(0, "寰呭洖璁�"),
+ PASSED(1, "宸插洖璁块�氳繃");
+
+ public static final Integer[] ARRAYS = Arrays.stream(values()).map(AfterSaleVisitStatusEnum::getStatus).toArray(Integer[]::new);
+
+ /**
+ * 鍥炶鐘舵��
+ */
+ private final Integer status;
+ /**
+ * 鍥炶鐘舵�佸悕绉�
+ */
+ private final String name;
+
+ @Override
+ public Integer[] array() {
+ return ARRAYS;
+ }
+
+ public static String getNameByStatus(Integer status) {
+ return Arrays.stream(values())
+ .filter(item -> item.getStatus().equals(status))
+ .map(AfterSaleVisitStatusEnum::getName)
+ .findFirst().orElse(null);
+ }
+
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java
index 7e73cf9..e775312 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java
@@ -52,4 +52,8 @@
ErrorCode COMPENSATION_AUDIT_REJECT_REASON_REQUIRED = new ErrorCode(1_022_004_006, "瀹℃牳涓嶉�氳繃鏃跺繀椤诲~鍐欎笉閫氳繃鍘熷洜");
ErrorCode COMPENSATION_UPDATE_FAIL_NOT_EDITABLE = new ErrorCode(1_022_004_007, "鍙湁鏈彁浜ゆ垨瀹℃牳涓嶉�氳繃鐘舵�佺殑璧斾粯鍗曟墠鑳戒慨鏀�");
+ // ========== 鍞悗鏈嶅姟-鍥炶锛�1-022-006-000锛� ==========
+ ErrorCode VISIT_NOT_EXISTS = new ErrorCode(1_022_006_000, "鍥炶璁板綍涓嶅瓨鍦�");
+ ErrorCode VISIT_CREATE_FAIL_STATUS = new ErrorCode(1_022_006_001, "鐧昏鍥炶澶辫触锛屽師鍥狅細宸ュ崟涓嶆槸宸插畬缁�(寰呭洖璁�)鐘舵��");
+
}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/visit/AfterSaleVisitService.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/visit/AfterSaleVisitService.java
new file mode 100644
index 0000000..68a8082
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/visit/AfterSaleVisitService.java
@@ -0,0 +1,52 @@
+package cn.iocoder.yudao.module.aftersales.service.visit;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.aftersales.controller.admin.visit.vo.AfterSaleVisitCreateReqVO;
+import cn.iocoder.yudao.module.aftersales.controller.admin.visit.vo.AfterSaleVisitPageReqVO;
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.visit.AfterSaleVisitDO;
+import jakarta.validation.Valid;
+
+import java.util.List;
+
+/**
+ * 鍞悗鍥炶璁板綍 Service 鎺ュ彛
+ */
+public interface AfterSaleVisitService {
+
+ /**
+ * 鐧昏鍥炶
+ * <p>
+ * 宸ュ崟椤诲浜庡凡瀹岀粨(寰呭洖璁�)鐘舵�併�傜櫥璁版椂鍚屾鎺ㄨ繘宸ュ崟锛�
+ * 婊℃剰涓旀湭澶嶅彂 鈫� 宸ュ崟鍥炶閫氳繃(鍙綊妗�)锛涗笉婊℃剰鎴栧鍙� 鈫� 宸ュ崟鍥為��澶勭悊涓噸鏂板鐞嗐��
+ *
+ * @param createReqVO 鐧昏淇℃伅
+ * @param userId 褰撳墠鐢ㄦ埛缂栧彿(鍥炶浜�)
+ * @return 鍥炶璁板綍缂栧彿
+ */
+ Long createVisit(@Valid AfterSaleVisitCreateReqVO createReqVO, Long userId);
+
+ /**
+ * 鑾峰緱鍥炶璁板綍
+ *
+ * @param id 缂栧彿
+ * @return 鍥炶璁板綍
+ */
+ AfterSaleVisitDO getVisit(Long id);
+
+ /**
+ * 鑾峰緱鏌愬伐鍗曠殑鍥炶璁板綍鍒楄〃
+ *
+ * @param ticketId 宸ュ崟缂栧彿
+ * @return 鍥炶璁板綍鍒楄〃
+ */
+ List<AfterSaleVisitDO> getVisitListByTicketId(Long ticketId);
+
+ /**
+ * 鑾峰緱鍥炶璁板綍鍒嗛〉
+ *
+ * @param pageReqVO 鍒嗛〉鏌ヨ
+ * @return 鍥炶璁板綍鍒嗛〉
+ */
+ PageResult<AfterSaleVisitDO> getVisitPage(AfterSaleVisitPageReqVO pageReqVO);
+
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/visit/AfterSaleVisitServiceImpl.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/visit/AfterSaleVisitServiceImpl.java
new file mode 100644
index 0000000..f30f75c
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/visit/AfterSaleVisitServiceImpl.java
@@ -0,0 +1,106 @@
+package cn.iocoder.yudao.module.aftersales.service.visit;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.aftersales.controller.admin.visit.vo.AfterSaleVisitCreateReqVO;
+import cn.iocoder.yudao.module.aftersales.controller.admin.visit.vo.AfterSaleVisitPageReqVO;
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.ticket.AfterSaleTicketDO;
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.visit.AfterSaleVisitDO;
+import cn.iocoder.yudao.module.aftersales.dal.mysql.ticket.AfterSaleTicketMapper;
+import cn.iocoder.yudao.module.aftersales.dal.mysql.visit.AfterSaleVisitMapper;
+import cn.iocoder.yudao.module.aftersales.enums.AfterSaleTicketStatusEnum;
+import cn.iocoder.yudao.module.aftersales.enums.AfterSaleVisitStatusEnum;
+import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.aftersales.enums.ErrorCodeConstants.TICKET_NOT_EXISTS;
+import static cn.iocoder.yudao.module.aftersales.enums.ErrorCodeConstants.VISIT_CREATE_FAIL_STATUS;
+import static cn.iocoder.yudao.module.aftersales.enums.ErrorCodeConstants.VISIT_NOT_EXISTS;
+
+/**
+ * 鍞悗鍥炶璁板綍 Service 瀹炵幇绫�
+ */
+@Service
+@Validated
+@Slf4j
+public class AfterSaleVisitServiceImpl implements AfterSaleVisitService {
+
+ @Resource
+ private AfterSaleVisitMapper visitMapper;
+ @Resource
+ private AfterSaleTicketMapper ticketMapper;
+ @Resource
+ private StorageAttachmentApi storageAttachmentApi;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long createVisit(AfterSaleVisitCreateReqVO createReqVO, Long userId) {
+ // 1. 鏍¢獙宸ュ崟锛氬繀椤诲瓨鍦ㄤ笖澶勪簬宸插畬缁�(寰呭洖璁�)鐘舵��
+ AfterSaleTicketDO ticket = ticketMapper.selectById(createReqVO.getTicketId());
+ if (ticket == null) {
+ throw exception(TICKET_NOT_EXISTS);
+ }
+ if (!AfterSaleTicketStatusEnum.COMPLETED.getStatus().equals(ticket.getStatus())) {
+ throw exception(VISIT_CREATE_FAIL_STATUS);
+ }
+
+ // 2. 鎻掑叆鍥炶璁板綍
+ AfterSaleVisitDO visitDO = BeanUtils.toBean(createReqVO, AfterSaleVisitDO.class)
+ .setVisitorUserId(userId)
+ .setVisitTime(LocalDateTime.now());
+ visitMapper.insert(visitDO);
+
+ // 3. 缁戝畾闄勪欢
+ if (CollUtil.isNotEmpty(createReqVO.getBlobIds())) {
+ storageAttachmentApi.bindAttachments("file", "aftersales_after_sale_visit",
+ visitDO.getId(), createReqVO.getBlobIds());
+ }
+
+ // 4. 鎺ㄨ繘宸ュ崟鍥炶鐘舵�侊細婊℃剰涓旀湭澶嶅彂 鈫� 閫氳繃锛涗笉婊℃剰鎴栧鍙� 鈫� 鍥為��澶勭悊涓噸鏂板鐞�
+ boolean satisfied = Boolean.TRUE.equals(createReqVO.getSatisfied());
+ boolean recurred = Boolean.TRUE.equals(createReqVO.getRecurred());
+ AfterSaleTicketDO update = new AfterSaleTicketDO().setId(ticket.getId())
+ .setLastVisitTime(visitDO.getVisitTime())
+ .setLastVisitSatisfied(satisfied)
+ .setLastVisitRecurred(recurred);
+ if (satisfied && !recurred) {
+ update.setVisitStatus(AfterSaleVisitStatusEnum.PASSED.getStatus());
+ } else {
+ update.setStatus(AfterSaleTicketStatusEnum.PROCESSING.getStatus())
+ .setResolvedTime(null)
+ .setVisitStatus(AfterSaleVisitStatusEnum.WAITING.getStatus());
+ }
+ ticketMapper.updateById(update);
+ return visitDO.getId();
+ }
+
+ @Override
+ public AfterSaleVisitDO getVisit(Long id) {
+ AfterSaleVisitDO visitDO = visitMapper.selectById(id);
+ if (visitDO == null) {
+ throw exception(VISIT_NOT_EXISTS);
+ }
+ return visitDO;
+ }
+
+ @Override
+ public List<AfterSaleVisitDO> getVisitListByTicketId(Long ticketId) {
+ return visitMapper.selectListByTicketId(ticketId);
+ }
+
+ @Override
+ public PageResult<AfterSaleVisitDO> getVisitPage(AfterSaleVisitPageReqVO pageReqVO) {
+ return visitMapper.selectPage(pageReqVO, pageReqVO.getTicketId(),
+ pageReqVO.getVisitType(), pageReqVO.getSatisfied());
+ }
+
+}
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java
index 88717e5..b514168 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.bpm.controller.admin.definition;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageReqVO;
@@ -117,7 +118,13 @@
public CommonResult<BpmProcessDefinitionRespVO> getProcessDefinition(
@RequestParam(value = "id", required = false) String id,
@RequestParam(value = "key", required = false) String key) {
- ProcessDefinition processDefinition = id != null ? processDefinitionService.getProcessDefinition(id)
+ // id 涓� key 閮戒负绌烘椂鐩存帴杩斿洖 null锛氬惁鍒欎細璋冪敤 getActiveProcessDefinition(null)锛�
+ // 鐢� Flowable 鎶� "key is null" 鐨� IllegalArgumentException 鍙樻垚 500
+ if (StrUtil.isBlank(id) && StrUtil.isBlank(key)) {
+ return success(null);
+ }
+ ProcessDefinition processDefinition = StrUtil.isNotBlank(id)
+ ? processDefinitionService.getProcessDefinition(id)
: processDefinitionService.getActiveProcessDefinition(key);
if (processDefinition == null) {
return success(null);
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java
index d8e6969..2829256 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java
@@ -107,9 +107,13 @@
BpmProcessInstanceRespVO respVO = BeanUtils.toBean(processInstance, BpmProcessInstanceRespVO.class);
respVO.setStatus(FlowableUtils.getProcessInstanceStatus(processInstance))
.setFormVariables(FlowableUtils.getProcessInstanceFormVariable(processInstance));
- // definition
- respVO.setProcessDefinition(BeanUtils.toBean(processDefinition, BpmProcessDefinitionRespVO.class));
- copyTo(processDefinitionInfo, respVO.getProcessDefinition());
+ // definition锛堟祦绋嬪畾涔夊彲鑳藉凡琚垹闄わ紝闇�瑕佸閿欙紝鍚﹀垯鍓嶇鎷垮埌 500锛�
+ if (processDefinition != null) {
+ respVO.setProcessDefinition(BeanUtils.toBean(processDefinition, BpmProcessDefinitionRespVO.class));
+ if (respVO.getProcessDefinition() != null && processDefinitionInfo != null) {
+ copyTo(processDefinitionInfo, respVO.getProcessDefinition());
+ }
+ }
// user
if (startUser != null) {
respVO.setStartUser(BeanUtils.toBean(startUser, UserSimpleBaseVO.class));
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmProcessDefinitionInfoMapper.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmProcessDefinitionInfoMapper.java
index 55f8de7..d3645ff 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmProcessDefinitionInfoMapper.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmProcessDefinitionInfoMapper.java
@@ -15,8 +15,19 @@
return selectList(BpmProcessDefinitionInfoDO::getProcessDefinitionId, processDefinitionIds);
}
+ /**
+ * 鏌ヨ娴佺▼瀹氫箟鐨勬墿灞曚俊鎭�
+ *
+ * <p>鍘嗗彶鍘熷洜鍚屼竴 processDefinitionId 鍙兘瀛樺湪澶氭潯璁板綍锛堥噸澶嶉儴缃� / 閲嶅淇濆瓨妯″瀷锛夛紝
+ * 鐩存帴鐢� selectOne 浼氭姏 TooManyResultsException 瀵艰嚧鎺ュ彛 500锛�
+ * 杩欓噷鏀逛负鍙栨渶鏂颁竴鏉★紝淇濊瘉鎺ュ彛鍙敤銆�</p>
+ */
default BpmProcessDefinitionInfoDO selectByProcessDefinitionId(String processDefinitionId) {
- return selectOne(BpmProcessDefinitionInfoDO::getProcessDefinitionId, processDefinitionId);
+ List<BpmProcessDefinitionInfoDO> list = selectList(
+ new LambdaQueryWrapperX<BpmProcessDefinitionInfoDO>()
+ .eq(BpmProcessDefinitionInfoDO::getProcessDefinitionId, processDefinitionId)
+ .orderByDesc(BpmProcessDefinitionInfoDO::getId));
+ return list.isEmpty() ? null : list.get(0);
}
default void updateByModelId(String modelId, BpmProcessDefinitionInfoDO updateObj) {
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/BpmProcessDefinitionIdUtils.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/BpmProcessDefinitionIdUtils.java
new file mode 100644
index 0000000..a3d72e2
--- /dev/null
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/BpmProcessDefinitionIdUtils.java
@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.bpm.framework.flowable.core.util;
+
+import cn.hutool.core.util.StrUtil;
+
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * Flowable 娴佺▼瀹氫箟缂栧彿宸ュ叿
+ *
+ * <p>娴佺▼瀹氫箟缂栧彿褰㈠ {@code qingjia:2:553a7ac9-...}锛屽寘鍚啋鍙枫��
+ * 鍓嶇濡傛灉瀵硅鍊煎仛浜� URL 缂栫爜鍚庡啀浣滀负鏌ヨ鍙傛暟浼犻�掞紙鍙岄噸缂栫爜锛夛紝
+ * Spring 鍙В鐮佷竴灞傦紝鏈�缁堟嬁鍒扮殑浠嶆槸 {@code qingjia%3A2%3A...}锛�
+ * Flowable 鎸夎缂栧彿鏌ヤ笉鍒版祦绋嬪畾涔夛紝鐩存帴鎶� FlowableObjectNotFoundException 瀵艰嚧 500銆�</p>
+ *
+ * <p>杩欓噷鍦ㄥ叆鍙e鍋氫竴娆″箓绛夌殑褰掍竴鍖栵細鍙湪纭疄娈嬬暀 % 杞箟鏃舵墠瑙g爜锛�
+ * 鍚堟硶鐨勬祦绋嬪畾涔夌紪鍙蜂笉鍙兘鍖呭惈 %锛屽洜姝や笉浼氳浼ゃ��</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public class BpmProcessDefinitionIdUtils {
+
+ /** 鏈�澶氳В鐮佸眰鏁帮紝闃叉寮傚父杈撳叆鏃犻檺寰幆 */
+ private static final int MAX_DECODE_TIMES = 5;
+
+ private BpmProcessDefinitionIdUtils() {
+ }
+
+ /**
+ * 褰掍竴鍖栨祦绋嬪畾涔夌紪鍙凤細閫愬眰瑙g爜娈嬬暀鐨� URL 杞箟
+ *
+ * @param id 娴佺▼瀹氫箟缂栧彿
+ * @return 褰掍竴鍖栧悗鐨勭紪鍙凤紱鍏ュ弬涓虹┖鏃跺師鏍疯繑鍥�
+ */
+ public static String normalize(String id) {
+ if (StrUtil.isBlank(id) || id.indexOf('%') < 0) {
+ return id;
+ }
+ String current = id;
+ for (int i = 0; i < MAX_DECODE_TIMES && current.indexOf('%') >= 0; i++) {
+ String decoded;
+ try {
+ decoded = URLDecoder.decode(current, StandardCharsets.UTF_8);
+ } catch (Exception ignored) {
+ // 瑙g爜澶辫触璇存槑涓嶆槸 URL 杞箟锛屼繚鎸佸師鍊�
+ break;
+ }
+ if (decoded.equals(current)) {
+ break;
+ }
+ current = decoded;
+ }
+ return current;
+ }
+
+}
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
index aa96518..ff4ecaa 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
@@ -11,12 +11,14 @@
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmProcessDefinitionInfoMapper;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConstants;
+import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmProcessDefinitionIdUtils;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.flowable.bpmn.model.BpmnModel;
+import org.flowable.common.engine.api.FlowableObjectNotFoundException;
import org.flowable.common.engine.impl.db.SuspensionState;
import org.flowable.engine.RepositoryService;
import org.flowable.engine.repository.Deployment;
@@ -57,7 +59,18 @@
@Override
public ProcessDefinition getProcessDefinition(String id) {
- return repositoryService.getProcessDefinition(id);
+ String definitionId = BpmProcessDefinitionIdUtils.normalize(id);
+ if (StrUtil.isBlank(definitionId)) {
+ return null;
+ }
+ // 缂栧彿涓嶅瓨鍦ㄦ椂 Flowable 浼氭姏 FlowableObjectNotFoundException锛�
+ // 杩欓噷缁熶竴杞垚 null 鐢辫皟鐢ㄦ柟澶勭悊锛岄伩鍏嶅墠绔嬁鍒� 500銆岀郴缁熷紓甯搞��
+ try {
+ return repositoryService.getProcessDefinition(definitionId);
+ } catch (FlowableObjectNotFoundException ex) {
+ log.warn("[getProcessDefinition][娴佺▼瀹氫箟({}) 涓嶅瓨鍦╙", definitionId);
+ return null;
+ }
}
@Override
@@ -65,7 +78,9 @@
if (CollUtil.isEmpty(ids)) {
return emptyList();
}
- return repositoryService.createProcessDefinitionQuery().processDefinitionIds(ids).list();
+ return repositoryService.createProcessDefinitionQuery()
+ .processDefinitionIds(ids.stream().map(BpmProcessDefinitionIdUtils::normalize)
+ .collect(java.util.stream.Collectors.toSet())).list();
}
@Override
@@ -88,7 +103,7 @@
public ProcessDefinition getActiveProcessDefinition(String key) {
return repositoryService.createProcessDefinitionQuery()
.processDefinitionTenantId(FlowableUtils.getTenantId())
- .processDefinitionKey(key).active().singleResult();
+ .processDefinitionKey(BpmProcessDefinitionIdUtils.normalize(key)).active().singleResult();
}
@Override
@@ -203,17 +218,30 @@
@Override
public BpmnModel getProcessDefinitionBpmnModel(String id) {
- return repositoryService.getBpmnModel(id);
+ String definitionId = BpmProcessDefinitionIdUtils.normalize(id);
+ if (StrUtil.isBlank(definitionId)) {
+ return null;
+ }
+ try {
+ return repositoryService.getBpmnModel(definitionId);
+ } catch (FlowableObjectNotFoundException ex) {
+ log.warn("[getProcessDefinitionBpmnModel][娴佺▼瀹氫箟({}) 涓嶅瓨鍦╙", definitionId);
+ return null;
+ }
}
@Override
public BpmProcessDefinitionInfoDO getProcessDefinitionInfo(String id) {
- return processDefinitionMapper.selectByProcessDefinitionId(id);
+ return processDefinitionMapper.selectByProcessDefinitionId(BpmProcessDefinitionIdUtils.normalize(id));
}
@Override
public List<BpmProcessDefinitionInfoDO> getProcessDefinitionInfoList(Collection<String> ids) {
- return processDefinitionMapper.selectListByProcessDefinitionIds(ids);
+ if (CollUtil.isEmpty(ids)) {
+ return emptyList();
+ }
+ return processDefinitionMapper.selectListByProcessDefinitionIds(ids.stream()
+ .map(BpmProcessDefinitionIdUtils::normalize).collect(java.util.stream.Collectors.toSet()));
}
@Override
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
index 85ff097..a7f083f 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
@@ -198,9 +198,13 @@
processVariables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_START_USER_ID, loginUserId);
}
// 1.3 璇诲彇鍏跺畠鐩稿叧鏁版嵁
- ProcessDefinition processDefinition = processDefinitionService.getProcessDefinition(
- historicProcessInstance != null ? historicProcessInstance.getProcessDefinitionId()
- : reqVO.getProcessDefinitionId());
+ String processDefinitionId = historicProcessInstance != null
+ ? historicProcessInstance.getProcessDefinitionId() : reqVO.getProcessDefinitionId();
+ ProcessDefinition processDefinition = processDefinitionService.getProcessDefinition(processDefinitionId);
+ if (processDefinition == null) {
+ // 娴佺▼瀹氫箟涓嶅瓨鍦ㄦ椂杩斿洖鏄庣‘鐨勪笟鍔¢敊璇紝閬垮厤 NPE / Flowable 寮傚父鍙樻垚 500銆岀郴缁熷紓甯搞��
+ throw exception(ErrorCodeConstants.PROCESS_DEFINITION_NOT_EXISTS);
+ }
BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService
.getProcessDefinitionInfo(processDefinition.getId());
BpmnModel bpmnModel = processDefinitionService.getProcessDefinitionBpmnModel(processDefinition.getId());
@@ -772,6 +776,9 @@
// 鑾峰緱娴佺▼瀹氫箟
ProcessDefinition definition = processDefinitionService
.getProcessDefinition(createReqVO.getProcessDefinitionId());
+ if (definition == null) {
+ throw exception(ErrorCodeConstants.PROCESS_DEFINITION_NOT_EXISTS);
+ }
// 鍙戣捣娴佺▼
return createProcessInstance0(userId, definition, createReqVO.getVariables(), null,
createReqVO.getStartUserSelectAssignees());
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java
index cb71daf..e788a01 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java
@@ -232,7 +232,7 @@
.dealTime(null).totalProductPrice(null).discountPercent(null).totalPrice(null).remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "鍟嗘満瀵煎叆妯℃澘.xls", "鍟嗘満鍒楄〃", CrmBusinessImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鍟嗘満瀵煎叆妯℃澘.xls", "鍟嗘満鍒楄〃", CrmBusinessImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/CrmContactController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/CrmContactController.java
index 9054253..c64f0b0 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/CrmContactController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/CrmContactController.java
@@ -40,6 +40,8 @@
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception0;
+import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
import static cn.iocoder.yudao.framework.common.pojo.PageParam.PAGE_SIZE_NONE;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
@@ -133,7 +135,9 @@
@GetMapping("/page-by-customer")
@Operation(summary = "鑾峰緱鑱旂郴浜哄垎椤碉紝鍩轰簬鎸囧畾瀹㈡埛")
public CommonResult<PageResult<CrmContactRespVO>> getContactPageByCustomer(@Valid CrmContactPageReqVO pageVO) {
- Assert.notNull(pageVO.getCustomerId(), "瀹㈡埛缂栧彿涓嶈兘涓虹┖");
+ if (pageVO.getCustomerId() == null) {
+ throw exception0(BAD_REQUEST.getCode(), "瀹㈡埛缂栧彿涓嶈兘涓虹┖");
+ }
PageResult<CrmContactDO> pageResult = contactService.getContactPageByCustomerId(pageVO);
return success(new PageResult<>(buildContactDetailList(pageResult.getList()), pageResult.getTotal()));
}
@@ -141,7 +145,9 @@
@GetMapping("/page-by-business")
@Operation(summary = "鑾峰緱鑱旂郴浜哄垎椤碉紝鍩轰簬鎸囧畾鍟嗘満")
public CommonResult<PageResult<CrmContactRespVO>> getContactPageByBusiness(@Valid CrmContactPageReqVO pageVO) {
- Assert.notNull(pageVO.getBusinessId(), "鍟嗘満缂栧彿涓嶈兘涓虹┖");
+ if (pageVO.getBusinessId() == null) {
+ throw exception0(BAD_REQUEST.getCode(), "鍟嗘満缂栧彿涓嶈兘涓虹┖");
+ }
PageResult<CrmContactDO> pageResult = contactService.getContactPageByBusinessId(pageVO);
return success(new PageResult<>(buildContactDetailList(pageResult.getList()), pageResult.getTotal()));
}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
index 5259145..cdfab75 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
@@ -58,6 +58,8 @@
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception0;
+import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@@ -150,7 +152,9 @@
@GetMapping("/page-by-customer")
@Operation(summary = "鑾峰緱鍚堝悓鍒嗛〉锛屽熀浜庢寚瀹氬鎴�")
public CommonResult<PageResult<CrmContractRespVO>> getContractPageByCustomer(@Valid CrmContractPageReqVO pageVO) {
- Assert.notNull(pageVO.getCustomerId(), "瀹㈡埛缂栧彿涓嶈兘涓虹┖");
+ if (pageVO.getCustomerId() == null) {
+ throw exception0(BAD_REQUEST.getCode(), "瀹㈡埛缂栧彿涓嶈兘涓虹┖");
+ }
PageResult<CrmContractDO> pageResult = contractService.getContractPageByCustomerId(pageVO);
return success(BeanUtils.toBean(pageResult, CrmContractRespVO.class).setList(buildContractDetailList(pageResult.getList())));
}
@@ -158,7 +162,9 @@
@GetMapping("/page-by-business")
@Operation(summary = "鑾峰緱鍚堝悓鍒嗛〉锛屽熀浜庢寚瀹氬晢鏈�")
public CommonResult<PageResult<CrmContractRespVO>> getContractPageByBusiness(@Valid CrmContractPageReqVO pageVO) {
- Assert.notNull(pageVO.getBusinessId(), "鍟嗘満缂栧彿涓嶈兘涓虹┖");
+ if (pageVO.getBusinessId() == null) {
+ throw exception0(BAD_REQUEST.getCode(), "鍟嗘満缂栧彿涓嶈兘涓虹┖");
+ }
PageResult<CrmContractDO> pageResult = contractService.getContractPageByBusinessId(pageVO);
return success(BeanUtils.toBean(pageResult, CrmContractRespVO.class).setList(buildContractDetailList(pageResult.getList())));
}
@@ -196,7 +202,7 @@
.payCycle(null).remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "鍚堝悓瀵煎叆妯℃澘.xls", "鍚堝悓鍒楄〃", CrmContractImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鍚堝悓瀵煎叆妯℃澘.xls", "鍚堝悓鍒楄〃", CrmContractImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/credit/CrmCreditRatingController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/credit/CrmCreditRatingController.java
index a3cd80a..37a04f3 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/credit/CrmCreditRatingController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/credit/CrmCreditRatingController.java
@@ -101,7 +101,7 @@
.score(null).evalType("").evalReason("").operatorName("")
.operateTime(null).validUntil(null).remark("").build()
);
- ExcelUtils.write(response, "瀹㈡埛淇$敤璇勭骇瀵煎叆妯℃澘.xls", "瀹㈡埛淇$敤璇勭骇鍒楄〃", CrmCreditRatingImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "瀹㈡埛淇$敤璇勭骇瀵煎叆妯℃澘.xls", "瀹㈡埛淇$敤璇勭骇鍒楄〃", CrmCreditRatingImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java
index 886dad1..91c4f6d 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java
@@ -49,6 +49,8 @@
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception0;
+import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
import static cn.iocoder.yudao.framework.common.pojo.PageParam.PAGE_SIZE_NONE;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertListByFlatMap;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
@@ -126,7 +128,9 @@
@GetMapping("/page-by-customer")
@Operation(summary = "鑾峰緱寮�绁ㄥ垎椤碉紝鍩轰簬鎸囧畾瀹㈡埛")
public CommonResult<PageResult<CrmInvoiceRespVO>> getInvoicePageByCustomer(@Valid CrmInvoicePageReqVO pageReqVO) {
- Assert.notNull(pageReqVO.getCustomerId(), "瀹㈡埛缂栧彿涓嶈兘涓虹┖");
+ if (pageReqVO.getCustomerId() == null) {
+ throw exception0(BAD_REQUEST.getCode(), "瀹㈡埛缂栧彿涓嶈兘涓虹┖");
+ }
PageResult<CrmInvoiceDO> pageResult = invoiceService.getInvoicePageByCustomerId(pageReqVO);
return success(new PageResult<>(buildInvoiceDetailList(pageResult.getList()), pageResult.getTotal()));
}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/CrmSaleQuotationController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/CrmSaleQuotationController.java
index 9cd55a3..00cfc2f 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/CrmSaleQuotationController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/CrmSaleQuotationController.java
@@ -83,7 +83,7 @@
@Operation(summary = "涓嬭浇閿�鍞姤浠峰鍏ユā鏉�")
@PreAuthorize("@ss.hasPermission('crm:sale-quotation:create')")
public void importTemplate(HttpServletResponse response) throws IOException {
- ExcelUtils.write(response, "閿�鍞姤浠峰鍏ユā鏉�.xls", "鎶ヤ环鏄庣粏", CrmSaleQuotationImportExcelVO.class, java.util.Collections.emptyList());
+ ExcelUtils.writeTemplate(response, "閿�鍞姤浠峰鍏ユā鏉�.xls", "鎶ヤ环鏄庣粏", CrmSaleQuotationImportExcelVO.class, java.util.Collections.emptyList());
}
@PostMapping("/import")
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivableController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivableController.java
index 3c6a398..3148550 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivableController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivableController.java
@@ -44,6 +44,8 @@
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception0;
+import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
import static cn.iocoder.yudao.framework.common.pojo.PageParam.PAGE_SIZE_NONE;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertListByFlatMap;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
@@ -119,7 +121,9 @@
@GetMapping("/page-by-customer")
@Operation(summary = "鑾峰緱鍥炴鍒嗛〉锛屽熀浜庢寚瀹氬鎴�")
public CommonResult<PageResult<CrmReceivableRespVO>> getReceivablePageByCustomer(@Valid CrmReceivablePageReqVO pageReqVO) {
- Assert.notNull(pageReqVO.getCustomerId(), "瀹㈡埛缂栧彿涓嶈兘涓虹┖");
+ if (pageReqVO.getCustomerId() == null) {
+ throw exception0(BAD_REQUEST.getCode(), "瀹㈡埛缂栧彿涓嶈兘涓虹┖");
+ }
PageResult<CrmReceivableDO> pageResult = receivableService.getReceivablePageByCustomerId(pageReqVO);
return success(new PageResult<>(buildReceivableDetailList(pageResult.getList()), pageResult.getTotal()));
}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivablePlanController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivablePlanController.java
index d67d74b..28f8e59 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivablePlanController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivablePlanController.java
@@ -41,6 +41,8 @@
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception0;
+import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
import static cn.iocoder.yudao.framework.common.pojo.PageParam.PAGE_SIZE_NONE;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
@@ -113,7 +115,9 @@
@GetMapping("/page-by-customer")
@Operation(summary = "鑾峰緱鍥炴璁″垝鍒嗛〉锛屽熀浜庢寚瀹氬鎴�")
public CommonResult<PageResult<CrmReceivablePlanRespVO>> getReceivablePlanPageByCustomer(@Valid CrmReceivablePlanPageReqVO pageReqVO) {
- Assert.notNull(pageReqVO.getCustomerId(), "瀹㈡埛缂栧彿涓嶈兘涓虹┖");
+ if (pageReqVO.getCustomerId() == null) {
+ throw exception0(BAD_REQUEST.getCode(), "瀹㈡埛缂栧彿涓嶈兘涓虹┖");
+ }
PageResult<CrmReceivablePlanDO> pageResult = receivablePlanService.getReceivablePlanPageByCustomerId(pageReqVO);
return success(new PageResult<>(buildReceivableDetailList(pageResult.getList()), pageResult.getTotal()));
}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contract/CrmContractMapper.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contract/CrmContractMapper.java
index 03098d9..c5b2327 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contract/CrmContractMapper.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contract/CrmContractMapper.java
@@ -164,7 +164,9 @@
LocalDateTime endOfToday = LocalDateTimeUtil.endOfDay(LocalDateTime.now());
if (CrmContractPageReqVO.EXPIRY_TYPE_ABOUT_TO_EXPIRE.equals(pageReqVO.getExpiryType())) { // 鍗冲皢鍒版湡
query.eq(CrmContractDO::getAuditStatus, CrmAuditStatusEnum.APPROVE.getStatus())
- .between(CrmContractDO::getEndTime, beginOfToday, endOfToday.plusDays(config.getNotifyDays()));
+ // notifyDays 鍙兘涓� null锛堝巻鍙查厤缃湭濉級锛屼负 null 鏃舵寜 0 澶╁鐞嗭紝閬垮厤鎷嗙 NPE
+ .between(CrmContractDO::getEndTime, beginOfToday,
+ endOfToday.plusDays(config.getNotifyDays() != null ? config.getNotifyDays() : 0));
} else if (CrmContractPageReqVO.EXPIRY_TYPE_EXPIRED.equals(pageReqVO.getExpiryType())) { // 宸插埌鏈�
query.eq(CrmContractDO::getAuditStatus, CrmAuditStatusEnum.APPROVE.getStatus())
.lt(CrmContractDO::getEndTime, endOfToday);
@@ -199,7 +201,9 @@
LocalDateTime beginOfToday = LocalDateTimeUtil.beginOfDay(LocalDateTime.now());
LocalDateTime endOfToday = LocalDateTimeUtil.endOfDay(LocalDateTime.now());
query.eq(CrmContractDO::getAuditStatus, CrmAuditStatusEnum.APPROVE.getStatus()) // 蹇呴』瀹℃壒閫氳繃锛�
- .between(CrmContractDO::getEndTime, beginOfToday, endOfToday.plusDays(config.getNotifyDays()));
+ // notifyDays 鍙兘涓� null锛堝巻鍙查厤缃湭濉級锛屼负 null 鏃舵寜 0 澶╁鐞嗭紝閬垮厤鎷嗙 NPE
+ .between(CrmContractDO::getEndTime, beginOfToday,
+ endOfToday.plusDays(config.getNotifyDays() != null ? config.getNotifyDays() : 0));
return selectCount(query);
}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
index 3052329..9258b67 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
@@ -530,9 +530,19 @@
if (config == null || Boolean.FALSE.equals(config.getNotifyEnabled())) {
return 0L;
}
+ // 鎻愰啋澶╂暟鏈厤缃椂鎸夐粯璁� 7 澶╁鐞嗭紝閬垮厤 config.getNotifyDays() 涓� null 鏃舵媶绠辨姏 NPE 瀵艰嚧鎺ュ彛 500
+ if (config.getNotifyDays() == null) {
+ config = BeanUtils.toBean(config, CrmContractConfigDO.class);
+ config.setNotifyDays(DEFAULT_NOTIFY_DAYS);
+ }
return contractMapper.selectCountByRemind(userId, config);
}
+ /**
+ * 鍚堝悓鍒版湡鎻愰啋鐨勯粯璁ゆ彁鍓嶅ぉ鏁帮細鍚堝悓鎻愰啋鏈厤缃� notifyDays 鏃朵娇鐢�
+ */
+ private static final Integer DEFAULT_NOTIFY_DAYS = 7;
+
@Override
public List<CrmContractDO> getContractListByCustomerIdOwnerUserId(Long customerId, Long ownerUserId) {
return contractMapper.selectListByCustomerIdOwnerUserId(customerId, ownerUserId);
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInvoiceController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInvoiceController.java
index d858caa..e3bf53f 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInvoiceController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInvoiceController.java
@@ -142,7 +142,7 @@
.invoiceTime(null).remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "鏉ョエ瀵煎叆妯℃澘.xls", "鏉ョエ鍒楄〃", ErpPurchaseInvoiceImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鏉ョエ瀵煎叆妯℃澘.xls", "鏉ョエ鍒楄〃", ErpPurchaseInvoiceImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
index c5d6530..c282f95 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
@@ -183,7 +183,7 @@
.count(null).taxPercent(null).qcCheckFlag(false).itemRemark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "閲囪喘璁㈠崟瀵煎叆妯℃澘.xls", "閲囪喘璁㈠崟鍒楄〃", ErpPurchaseOrderImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "閲囪喘璁㈠崟瀵煎叆妯℃澘.xls", "閲囪喘璁㈠崟鍒楄〃", ErpPurchaseOrderImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchasePlanController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchasePlanController.java
index 39a5142..260568e 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchasePlanController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchasePlanController.java
@@ -146,7 +146,7 @@
.demandTime(null).itemRemark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "閲囪喘璁″垝瀵煎叆妯℃澘.xls", "閲囪喘璁″垝鍒楄〃", ErpPurchasePlanImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "閲囪喘璁″垝瀵煎叆妯℃澘.xls", "閲囪喘璁″垝鍒楄〃", ErpPurchasePlanImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
index ee21695..e5efcc1 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
@@ -152,7 +152,7 @@
.itemRemark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "閲囪喘鐢宠瀵煎叆妯℃澘.xls", "閲囪喘鐢宠鍒楄〃", ErpPurchaseRequestImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "閲囪喘鐢宠瀵煎叆妯℃澘.xls", "閲囪喘鐢宠鍒楄〃", ErpPurchaseRequestImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
index be6a2b5..a3f4404 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
@@ -211,7 +211,7 @@
.productPrice(null).count(null).taxPercent(null).needProduction(0).itemRemark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "閿�鍞鍗曞鍏ユā鏉�.xls", "閿�鍞鍗曞垪琛�", ErpSaleOrderImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "閿�鍞鍗曞鍏ユā鏉�.xls", "閿�鍞鍗曞垪琛�", ErpSaleOrderImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApi.java b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApi.java
new file mode 100644
index 0000000..0f28474
--- /dev/null
+++ b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApi.java
@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.module.hrm.api.employee;
+
+import cn.iocoder.yudao.module.hrm.api.employee.dto.HrmEmployeeSimpleDTO;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 鍛樺伐妗f API 鎺ュ彛
+ *
+ * <p>鎻愪緵缁欏叾浠栨ā鍧楄法妯″潡鏌ヨ鍛樺伐绮剧畝淇℃伅锛�
+ * 渚嬪瀹夊叏鐢熶骇妯″潡鐨勭壒绉嶄綔涓氳瘉闇�瑕佸叧鑱旀寔璇佷汉銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface HrmEmployeeApi {
+
+ /**
+ * 鑾峰彇鍛樺伐绮剧畝淇℃伅
+ *
+ * @param id 鍛樺伐缂栧彿
+ * @return 鍛樺伐淇℃伅锛屼笉瀛樺湪杩斿洖 null
+ */
+ HrmEmployeeSimpleDTO getEmployee(Long id);
+
+ /**
+ * 鎵归噺鑾峰彇鍛樺伐绮剧畝淇℃伅
+ *
+ * @param ids 鍛樺伐缂栧彿闆嗗悎
+ * @return 鍛樺伐淇℃伅鍒楄〃
+ */
+ List<HrmEmployeeSimpleDTO> getEmployeeList(Collection<Long> ids);
+
+ /**
+ * 鏍¢獙鍛樺伐鏄惁瀛樺湪锛堜笖鏈垹闄わ級
+ *
+ * @param id 鍛樺伐缂栧彿
+ * @return 鏄惁瀛樺湪
+ */
+ boolean validateEmployeeExists(Long id);
+
+}
diff --git a/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/dto/HrmEmployeeSimpleDTO.java b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/dto/HrmEmployeeSimpleDTO.java
new file mode 100644
index 0000000..f934b8c
--- /dev/null
+++ b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/dto/HrmEmployeeSimpleDTO.java
@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.hrm.api.employee.dto;
+
+import lombok.Data;
+
+/**
+ * 鍛樺伐绮剧畝淇℃伅 DTO
+ *
+ * <p>渚涘叾浠栨ā鍧楋紙濡傚畨鍏ㄧ敓浜фā鍧楃殑鐗圭浣滀笟璇侊級鍏宠仈鍛樺伐妗f鏃朵娇鐢ㄣ��</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Data
+public class HrmEmployeeSimpleDTO {
+
+ /**
+ * 鍛樺伐缂栧彿
+ */
+ private Long id;
+
+ /**
+ * 鍏宠仈鐨勭郴缁熺敤鎴风紪鍙�
+ *
+ * 鍏宠仈 AdminUserDO#getId()
+ */
+ private Long userId;
+
+ /**
+ * 鍛樺伐缂栧彿锛堝伐鍙凤級
+ */
+ private String employeeNo;
+
+ /**
+ * 鍛樺伐濮撳悕
+ */
+ private String name;
+
+ /**
+ * 閮ㄩ棬缂栧彿
+ */
+ private Long deptId;
+
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
+ private String deptName;
+
+ /**
+ * 鎵嬫満鍙风爜
+ */
+ private String phone;
+
+ /**
+ * 鍛樺伐鐘舵�侊細1-鍦ㄨ亴锛�2-璇曠敤锛�3-绂昏亴
+ */
+ private Integer employeeStatus;
+
+}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApiImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApiImpl.java
new file mode 100644
index 0000000..8528486
--- /dev/null
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApiImpl.java
@@ -0,0 +1,85 @@
+package cn.iocoder.yudao.module.hrm.api.employee;
+
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.hrm.api.employee.dto.HrmEmployeeSimpleDTO;
+import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
+import cn.iocoder.yudao.module.hrm.dal.mysql.employee.HrmEmployeeMapper;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * 鍛樺伐妗f API 瀹炵幇绫�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+public class HrmEmployeeApiImpl implements HrmEmployeeApi {
+
+ @Resource
+ private HrmEmployeeMapper employeeMapper;
+ @Resource
+ private DeptApi deptApi;
+
+ @Override
+ public HrmEmployeeSimpleDTO getEmployee(Long id) {
+ if (id == null) {
+ return null;
+ }
+ HrmEmployeeDO employee = employeeMapper.selectById(id);
+ if (employee == null) {
+ return null;
+ }
+ return build(employee, getDeptName(employee.getDeptId()));
+ }
+
+ @Override
+ public List<HrmEmployeeSimpleDTO> getEmployeeList(Collection<Long> ids) {
+ if (ids == null || ids.isEmpty()) {
+ return List.of();
+ }
+ List<HrmEmployeeDO> employees = employeeMapper.selectBatchIds(ids);
+ if (employees.isEmpty()) {
+ return List.of();
+ }
+ // 鎵归噺鏌ラ儴闂紝閬垮厤 N+1
+ List<Long> deptIds = employees.stream().map(HrmEmployeeDO::getDeptId)
+ .filter(Objects::nonNull).distinct().toList();
+ // 鐢� new HashMap<>() 鑰岄潪 Map.of()锛氬憳宸ョ殑 deptId 鍏佽涓虹┖锛�
+ // 鍚庨潰 deptMap.get(e.getDeptId()) 浼� get(null)锛孧ap.of() 鐨� get(null) 鎶� NPE銆�
+ Map<Long, DeptRespDTO> deptMap = deptIds.isEmpty() ? new HashMap<>() : deptApi.getDeptMap(deptIds);
+ return employees.stream()
+ .map(e -> {
+ DeptRespDTO dept = deptMap.get(e.getDeptId());
+ return build(e, dept == null ? null : dept.getName());
+ })
+ .toList();
+ }
+
+ @Override
+ public boolean validateEmployeeExists(Long id) {
+ return id != null && employeeMapper.selectById(id) != null;
+ }
+
+ private String getDeptName(Long deptId) {
+ if (deptId == null) {
+ return null;
+ }
+ DeptRespDTO dept = deptApi.getDept(deptId);
+ return dept == null ? null : dept.getName();
+ }
+
+ private static HrmEmployeeSimpleDTO build(HrmEmployeeDO employee, String deptName) {
+ HrmEmployeeSimpleDTO dto = BeanUtils.toBean(employee, HrmEmployeeSimpleDTO.class);
+ dto.setDeptName(deptName);
+ return dto;
+ }
+
+}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceHolidayController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceHolidayController.java
index 0f3fb75..08dec28 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceHolidayController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceHolidayController.java
@@ -101,7 +101,7 @@
.type(1).isLegal(1).remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "鑺傚亣鏃ラ厤缃鍏ユā鏉�.xls", "鑺傚亣鏃ラ厤缃垪琛�", HrmAttendanceHolidayImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鑺傚亣鏃ラ厤缃鍏ユā鏉�.xls", "鑺傚亣鏃ラ厤缃垪琛�", HrmAttendanceHolidayImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
index 4f21141..787284f 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
@@ -230,7 +230,7 @@
.remark("绀轰緥鏁版嵁")
.build()
);
- ExcelUtils.write(response, "鑰冨嫟瀵煎叆妯℃澘.xls", "鑰冨嫟璁板綍", HrmAttendanceRecordImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鑰冨嫟瀵煎叆妯℃澘.xls", "鑰冨嫟璁板綍", HrmAttendanceRecordImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/certificate/HrmCertificateController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/certificate/HrmCertificateController.java
index 871585e..b42bbb7 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/certificate/HrmCertificateController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/certificate/HrmCertificateController.java
@@ -153,7 +153,7 @@
.expireDate(LocalDate.of(2029, 1, 1)).remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "璇佷功璧勮川瀵煎叆妯℃澘.xls", "璇佷功璧勮川鍒楄〃", HrmCertificateImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "璇佷功璧勮川瀵煎叆妯℃澘.xls", "璇佷功璧勮川鍒楄〃", HrmCertificateImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmEmployeeSocialSecurityController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmEmployeeSocialSecurityController.java
index 74baf87..3587ccc 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmEmployeeSocialSecurityController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmEmployeeSocialSecurityController.java
@@ -231,7 +231,7 @@
.effectiveDate(LocalDate.of(2026, 1, 1)).status(0).remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "鍛樺伐绀句繚鍏Н閲戞。妗堝鍏ユā鏉�.xls", "鍛樺伐绀句繚鍏Н閲戞。妗堝垪琛�",
+ ExcelUtils.writeTemplate(response, "鍛樺伐绀句繚鍏Н閲戞。妗堝鍏ユā鏉�.xls", "鍛樺伐绀句繚鍏Н閲戞。妗堝垪琛�",
HrmEmployeeSocialSecurityImportExcelVO.class, list);
}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSocialSecuritySchemeController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSocialSecuritySchemeController.java
index 2a3f3ec..e9e8dd2 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSocialSecuritySchemeController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSocialSecuritySchemeController.java
@@ -94,7 +94,7 @@
.status(0).remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "绀句繚鍏Н閲戞柟妗堝鍏ユā鏉�.xls", "绀句繚鍏Н閲戞柟妗堝垪琛�",
+ ExcelUtils.writeTemplate(response, "绀句繚鍏Н閲戞柟妗堝鍏ユā鏉�.xls", "绀句繚鍏Н閲戞柟妗堝垪琛�",
HrmSocialSecuritySchemeImportExcelVO.class, list);
}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmTaxRateConfigController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmTaxRateConfigController.java
index fc851e3..c7e3dca 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmTaxRateConfigController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmTaxRateConfigController.java
@@ -98,7 +98,7 @@
.taxRate(new BigDecimal("3")).quickDeduction(new BigDecimal("0")).status(0).remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "涓◣绋庣巼閰嶇疆瀵煎叆妯℃澘.xls", "涓◣绋庣巼閰嶇疆鍒楄〃",
+ ExcelUtils.writeTemplate(response, "涓◣绋庣巼閰嶇疆瀵煎叆妯℃澘.xls", "涓◣绋庣巼閰嶇疆鍒楄〃",
HrmTaxRateConfigImportExcelVO.class, list);
}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/employee/HrmEmployeeMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/employee/HrmEmployeeMapper.java
index 5b57a75..21ba81c 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/employee/HrmEmployeeMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/employee/HrmEmployeeMapper.java
@@ -7,6 +7,8 @@
import cn.iocoder.yudao.module.hrm.controller.admin.employee.vo.HrmEmployeePageReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
import java.util.Collection;
import java.util.List;
@@ -23,6 +25,17 @@
return selectOne(HrmEmployeeDO::getPhone, phone);
}
+ /**
+ * 鎸夋墜鏈哄彿鏌ヨ鍛樺伐锛�<b>鍖呭惈宸茶蒋鍒犻櫎鐨勮褰�</b>
+ *
+ * <p>鐢ㄤ簬閲婃斁銆岃蒋鍒犻櫎浣嗕粛鍗犵敤鍞竴绱㈠紩銆嶇殑鍘嗗彶鎵嬫満鍙凤細
+ * hrm_employee.uk_phone 寤哄湪 phone 鍒椾笂锛堜笉鍚� deleted锛夛紝
+ * 鑰� {@link #selectByPhone(String)} 浼氳閫昏緫鍒犻櫎鎻掍欢杩囨护鎺� deleted=1 鐨勮锛�
+ * 瀵艰嚧棰勬牎楠屾煡涓嶅埌銆佸啓搴撴椂鍗存挒鍞竴绱㈠紩锛屾渶缁堟姏 DuplicateKeyException 鍙樻垚 500銆�</p>
+ */
+ @Select("SELECT * FROM hrm_employee WHERE phone = #{phone} LIMIT 1")
+ HrmEmployeeDO selectByPhoneIncludeDeleted(@Param("phone") String phone);
+
default HrmEmployeeDO selectByName(String name) {
return selectOne(HrmEmployeeDO::getName, name);
}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java
index 424a3ea..35a9635 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java
@@ -38,6 +38,7 @@
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserCreateReqDTO;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserSyncReqDTO;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
@@ -107,10 +108,8 @@
deptApi.validateDeptList(Collections.singleton(createReqVO.getDeptId()));
// 2. 鏍¢獙宀椾綅
postApi.validPostList(Collections.singleton(createReqVO.getPostId()));
- // 3. 鏍¢獙鎵嬫満鍙锋槸鍚﹀凡瀛樺湪
- if (employeeMapper.selectByPhone(createReqVO.getPhone()) != null) {
- throw exception(EMPLOYEE_PHONE_EXISTS);
- }
+ // 3. 鏍¢獙鎵嬫満鍙锋槸鍚﹀凡瀛樺湪锛堝苟閲婃斁杞垹闄ゅ巻鍙茶褰曞崰鐢ㄧ殑鎵嬫満鍙凤級
+ validatePhoneUniqueAndReleaseStale(null, createReqVO.getPhone());
// 4. 鍚屾鍒涘缓绯荤粺鐢ㄦ埛
AdminUserCreateReqDTO userCreateReqDTO = new AdminUserCreateReqDTO();
userCreateReqDTO.setUsername(createReqVO.getPhone());
@@ -167,6 +166,42 @@
return employeeId;
}
+ /**
+ * 缁熶竴鎵嬫満鍙峰敮涓�鎬ф牎楠�
+ *
+ * <p>鑳屾櫙锛歨rm_employee.uk_phone 鏄缓鍦� phone 鍒椾笂鐨勫敮涓�绱㈠紩锛堜笉鍚� deleted锛夛紝
+ * 鍥犳銆屽凡杞垹闄や絾鎵嬫満鍙锋湭娓呯┖銆嶇殑鍘嗗彶妗f浼氶暱鏈熷崰鐫�杩欎釜鎵嬫満鍙枫��
+ * 姝ゆ椂 MyBatis-Plus 鐨� selectByPhone 鍥犻�昏緫鍒犻櫎杩囨护鏌ヤ笉鍒板畠锛岄鏍¢獙閫氳繃锛�
+ * 浣嗗啓搴撴椂鏁版嵁搴撲粛浼氭姏 DuplicateKeyException锛屾帴鍙h〃鐜颁负 500銆岀郴缁熷紓甯搞�嶃��</p>
+ *
+ * <p>澶勭悊绛栫暐锛堜笉鏀瑰簱缁撴瀯锛夛細
+ * 1. 鑻ユ墜鏈哄彿琚�屽凡杞垹闄ゃ�嶇殑鍘嗗彶璁板綍鍗犵敤 鈫� 鑷姩娓呯┖璇ュ巻鍙茶褰曠殑鎵嬫満鍙凤紝閲婃斁鍞竴绱㈠紩锛�
+ * 2. 鑻ヨ銆屾湭鍒犻櫎銆嶇殑鍏朵粬鍛樺伐鍗犵敤 鈫� 鎶涗笟鍔″紓甯搞�屾墜鏈哄彿宸插瓨鍦ㄣ�嶏紝涓嶅啀杩斿洖 500銆�</p>
+ *
+ * @param selfId 褰撳墠姝e湪鏂板/淇敼鐨勫憳宸ョ紪鍙凤紙鏂板浼� null锛夛紱鍛戒腑鑷韩鏃惰烦杩�
+ * @param phone 寰呮牎楠岀殑鎵嬫満鍙�
+ */
+ private void validatePhoneUniqueAndReleaseStale(Long selfId, String phone) {
+ if (StrUtil.isBlank(phone)) {
+ return;
+ }
+ // 1. 閲婃斁琚蒋鍒犻櫎鍘嗗彶璁板綍鍗犵敤鐨勬墜鏈哄彿
+ HrmEmployeeDO staleHolder = employeeMapper.selectByPhoneIncludeDeleted(phone);
+ if (staleHolder != null && !Objects.equals(staleHolder.getId(), selfId)
+ && Boolean.TRUE.equals(staleHolder.getDeleted())) {
+ employeeMapper.update(null, new LambdaUpdateWrapper<HrmEmployeeDO>()
+ .eq(HrmEmployeeDO::getId, staleHolder.getId())
+ .set(HrmEmployeeDO::getPhone, null));
+ log.info("[validatePhoneUniqueAndReleaseStale][閲婃斁鍘嗗彶杞垹闄ゅ憳宸�({})鍗犵敤鐨勬墜鏈哄彿]",
+ staleHolder.getId());
+ }
+ // 2. 鏍¢獙鏄惁浠嶈娲昏穬鍛樺伐鍗犵敤
+ HrmEmployeeDO exist = employeeMapper.selectByPhone(phone);
+ if (exist != null && !Objects.equals(exist.getId(), selfId)) {
+ throw exception(EMPLOYEE_PHONE_EXISTS);
+ }
+ }
+
private String generateUniqueEmployeeNo() {
String employeeNo = noRedisDAO.generateEmployeeNo();
if (employeeMapper.selectByEmployeeNo(employeeNo) != null) {
@@ -184,10 +219,9 @@
deptApi.validateDeptList(Collections.singleton(updateReqVO.getDeptId()));
// 鏍¢獙宀椾綅
postApi.validPostList(Collections.singleton(updateReqVO.getPostId()));
- // 鏍¢獙鎵嬫満鍙锋槸鍚﹀凡瀛樺湪锛堝鏋滄墜鏈哄彿鏈夊彉鏇达級
- if (!Objects.equals(employee.getPhone(), updateReqVO.getPhone())
- && employeeMapper.selectByPhone(updateReqVO.getPhone()) != null) {
- throw exception(EMPLOYEE_PHONE_EXISTS);
+ // 鏍¢獙鎵嬫満鍙锋槸鍚﹀凡瀛樺湪锛堝鏋滄墜鏈哄彿鏈夊彉鏇达紱骞堕噴鏀捐蒋鍒犻櫎鍘嗗彶璁板綍鍗犵敤鐨勬墜鏈哄彿锛�
+ if (!Objects.equals(employee.getPhone(), updateReqVO.getPhone())) {
+ validatePhoneUniqueAndReleaseStale(updateReqVO.getId(), updateReqVO.getPhone());
}
// 鏇存柊鍛樺伐涓昏〃
HrmEmployeeDO updateObj = BeanUtils.toBean(updateReqVO, HrmEmployeeDO.class);
@@ -286,7 +320,15 @@
educationMapper.deleteByEmployeeId(id);
workHistoryMapper.deleteByEmployeeId(id);
emergencyContactMapper.deleteByEmployeeId(id);
- // 3. 鍒犻櫎鍛樺伐
+ // 3. 杞垹闄ゅ墠閲婃斁鍞竴绾︽潫瀛楁锛岄伩鍏嶅巻鍙叉暟鎹暱鏈熷崰鐢� uk_phone / uk_user_id锛�
+ // 瀵艰嚧鍚庣画鏂版。妗堜娇鐢ㄥ悓涓�鎵嬫満鍙锋垨缁戝畾鍚屼竴璐﹀彿鏃舵挒鏁版嵁搴撳敮涓�绱㈠紩锛堣〃鐜颁负 500锛�
+ // 娉細employee_no 涓� NOT NULL 涓� uk_employee_no 鏈惈 deleted锛岃繖閲屼笉缃┖锛�
+ // 浣嗘妸 user_id 缃┖鍙噴鏀� uk_user_id锛涙墜鏈哄彿缃┖鍙噴鏀� uk_phone銆�
+ employeeMapper.update(null, new LambdaUpdateWrapper<HrmEmployeeDO>()
+ .eq(HrmEmployeeDO::getId, id)
+ .set(HrmEmployeeDO::getPhone, null)
+ .set(HrmEmployeeDO::getUserId, null));
+ // 4. 鍒犻櫎鍛樺伐
employeeMapper.deleteById(id);
}
@@ -474,6 +516,8 @@
}
}
HrmEmployeeSaveReqVO save = buildImportSaveReqVO(row, deptMatches.get(0).getId(), postMatches.get(0).getId(), roleIds);
+ // 瀵煎叆鍓嶅厛閲婃斁琚蒋鍒犻櫎鍘嗗彶璁板綍鍗犵敤鐨勬墜鏈哄彿锛岄伩鍏嶆暣琛屽鍏ュ洜鍞竴绱㈠紩鍐茬獊澶辫触
+ validatePhoneUniqueAndReleaseStale(null, row.getPhone());
HrmEmployeeDO existing = employeeMapper.selectByPhone(row.getPhone());
if (existing == null) {
if (row.getGender() == null) throw exception(EMPLOYEE_IMPORT_FIELD_REQUIRED, "鎬у埆");
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/remind/HrmExpiryRemindServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/remind/HrmExpiryRemindServiceImpl.java
index 72923c9..15b981a 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/remind/HrmExpiryRemindServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/remind/HrmExpiryRemindServiceImpl.java
@@ -184,8 +184,10 @@
}
private Map<Long, HrmEmployeeDO> buildEmployeeMap(java.util.Collection<Long> employeeIds) {
+ // 蹇呴』杩斿洖鍙帴鍙� null key 鐨勭┖ Map锛氳皟鐢ㄦ柟浼� employeeMap.get(certificate.getEmployeeId())锛�
+ // 鑰� employeeId 鍏佽涓虹┖锛堣瘉浠�/鍚堝悓鏈粦瀹氬憳宸ワ級锛孧ap.of() 鐨� get(null) 浼氭姏 NPE 瀵艰嚧鍒楄〃鎺ュ彛 500
if (CollUtil.isEmpty(employeeIds)) {
- return Map.of();
+ return new HashMap<>();
}
return employeeService.getEmployeeList(employeeIds).stream()
.collect(java.util.stream.Collectors.toMap(HrmEmployeeDO::getId, e -> e, (a, b) -> a));
diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/ImGroupMemberController.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/ImGroupMemberController.java
index c752eeb..de42f52 100644
--- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/ImGroupMemberController.java
+++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/ImGroupMemberController.java
@@ -27,6 +27,8 @@
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception0;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.module.im.enums.ErrorCodeConstants.GROUP_MEMBER_NOT_IN_GROUP;
@@ -67,8 +69,9 @@
} else if (groupId != null && userId != null) {
member = groupMemberService.getGroupMember(groupId, userId);
} else {
- // 閬垮厤 selectByGroupIdAndUserId 鏀跺埌 null 鍙傛暟璧板叏琛ㄦ壂 / 鎶� SQL 寮傚父
- throw new IllegalArgumentException("鍙傛暟缂哄け锛氶渶浼� id 鎴� (groupId, userId)");
+ // 閬垮厤 selectByGroupIdAndUserId 鏀跺埌 null 鍙傛暟璧板叏琛ㄦ壂 / 鎶� SQL 寮傚父銆�
+ // 杩欓噷灞炰簬瀹㈡埛绔弬鏁伴棶棰橈紝鎶涗笟鍔″紓甯歌繑鍥� 400锛屼笉瑕佺敤 IllegalArgumentException 鍙樻垚 500
+ throw exception0(BAD_REQUEST.getCode(), "鍙傛暟缂哄け锛氶渶浼� id 鎴� (groupId, userId)");
}
if (member == null) {
return success(null);
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemPageReqVO.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemPageReqVO.java
index 93e87b5..eb1604b 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemPageReqVO.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemPageReqVO.java
@@ -7,12 +7,16 @@
import lombok.ToString;
import java.time.LocalDateTime;
+import java.util.List;
@Schema(description = "绠$悊鍚庡彴 - MDM 鐗╂枡鍒嗛〉 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class MdmItemPageReqVO extends PageParam {
+
+ @Schema(description = "鎺掗櫎鐨勭墿鏂欑紪鍙�")
+ private List<Long> excludeIds;
@Schema(description = "鐗╂枡缂栫爜", example = "ITEM001")
private String code;
@@ -38,4 +42,4 @@
@Schema(description = "鍒涘缓鏃堕棿")
private LocalDateTime[] createTime;
-}
\ No newline at end of file
+}
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/mysql/item/MdmItemMapper.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/mysql/item/MdmItemMapper.java
index e729149..0dd3f9f 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/mysql/item/MdmItemMapper.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/mysql/item/MdmItemMapper.java
@@ -31,7 +31,8 @@
.eqIfPresent(MdmItemDO::getStatus, reqVO.getStatus())
.betweenIfPresent(MdmItemDO::getCreateTime, reqVO.getCreateTime())
.orderByAsc(MdmItemDO::getSort)
- .orderByDesc(MdmItemDO::getId));
+ .orderByDesc(MdmItemDO::getId)
+ .notIn(reqVO.getExcludeIds() != null && !reqVO.getExcludeIds().isEmpty(), MdmItemDO::getId, reqVO.getExcludeIds()));
}
default List<MdmItemDO> selectList(MdmItemPageReqVO reqVO, Collection<Long> categoryIds) {
@@ -93,4 +94,4 @@
*/
List<Map<String, Object>> selectItemReferenceCount(@Param("itemId") Long itemId);
-}
\ No newline at end of file
+}
diff --git a/yudao-module-mes/pom.xml b/yudao-module-mes/pom.xml
index 989e0c1..f556006 100644
--- a/yudao-module-mes/pom.xml
+++ b/yudao-module-mes/pom.xml
@@ -31,6 +31,13 @@
<version>${revision}</version>
</dependency>
+ <!-- HRM 浜哄姏璧勬簮 API锛氬畨鍏ㄧ敓浜фā鍧楃殑鐗圭浣滀笟璇侀渶鍏宠仈鍛樺伐妗f -->
+ <dependency>
+ <groupId>cn.iocoder.boot</groupId>
+ <artifactId>yudao-module-hrm-api</artifactId>
+ <version>${revision}</version>
+ </dependency>
+
<!-- MDM 涓绘暟鎹鐞� API -->
<dependency>
<groupId>cn.iocoder.boot</groupId>
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanController.java
index 34a6985..73355e2 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanController.java
@@ -119,7 +119,7 @@
.remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "鎺掔彮璁″垝瀵煎叆妯℃澘.xls", "鎺掔彮璁″垝鍒楄〃", MesCalPlanImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鎺掔彮璁″垝瀵煎叆妯℃澘.xls", "鎺掔彮璁″垝鍒楄〃", MesCalPlanImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkplan/MesDvCheckPlanController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkplan/MesDvCheckPlanController.java
index a4bb4c9..6fde67d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkplan/MesDvCheckPlanController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkplan/MesDvCheckPlanController.java
@@ -125,7 +125,7 @@
.build()
);
// 杈撳嚭
- ExcelUtils.write(response, "鐐规淇濆吇鏂规瀵煎叆妯℃澘.xls", "鐐规淇濆吇鏂规鍒楄〃", MesDvCheckPlanImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鐐规淇濆吇鏂规瀵煎叆妯℃澘.xls", "鐐规淇濆吇鏂规鍒楄〃", MesDvCheckPlanImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkrecord/MesDvCheckRecordController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkrecord/MesDvCheckRecordController.java
index 76cbd4f..55598d6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkrecord/MesDvCheckRecordController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkrecord/MesDvCheckRecordController.java
@@ -162,7 +162,7 @@
.build()
);
// 杈撳嚭
- ExcelUtils.write(response, "璁惧鐐规璁板綍瀵煎叆妯℃澘.xls", "璁惧鐐规璁板綍鍒楄〃", MesDvCheckRecordImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "璁惧鐐规璁板綍瀵煎叆妯℃澘.xls", "璁惧鐐规璁板綍鍒楄〃", MesDvCheckRecordImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/maintenrecord/MesDvMaintenRecordController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/maintenrecord/MesDvMaintenRecordController.java
index fba88ad..b24a032 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/maintenrecord/MesDvMaintenRecordController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/maintenrecord/MesDvMaintenRecordController.java
@@ -165,7 +165,7 @@
.build()
);
// 杈撳嚭
- ExcelUtils.write(response, "璁惧淇濆吇璁板綍瀵煎叆妯℃澘.xls", "璁惧淇濆吇璁板綍鍒楄〃", MesDvMaintenRecordImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "璁惧淇濆吇璁板綍瀵煎叆妯℃澘.xls", "璁惧淇濆吇璁板綍鍒楄〃", MesDvMaintenRecordImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/metering/MesDvMeteringController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/metering/MesDvMeteringController.java
index 91ddc0e..95ed2a6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/metering/MesDvMeteringController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/metering/MesDvMeteringController.java
@@ -157,7 +157,7 @@
.build()
);
// 杈撳嚭
- ExcelUtils.write(response, "璁¢噺鍣ㄥ叿瀵煎叆妯℃澘.xls", "璁¢噺鍣ㄥ叿鍒楄〃", MesDvMeteringImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "璁¢噺鍣ㄥ叿瀵煎叆妯℃澘.xls", "璁¢噺鍣ㄥ叿鍒楄〃", MesDvMeteringImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/meteringcheck/MesDvMeteringCheckController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/meteringcheck/MesDvMeteringCheckController.java
index cec6023..daf8ea0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/meteringcheck/MesDvMeteringCheckController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/meteringcheck/MesDvMeteringCheckController.java
@@ -144,7 +144,7 @@
.build()
);
// 杈撳嚭
- ExcelUtils.write(response, "璁¢噺妫�娴嬭褰曞鍏ユā鏉�.xls", "璁¢噺妫�娴嬭褰曞垪琛�", MesDvMeteringCheckImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "璁¢噺妫�娴嬭褰曞鍏ユā鏉�.xls", "璁¢噺妫�娴嬭褰曞垪琛�", MesDvMeteringCheckImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/repair/MesDvRepairController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/repair/MesDvRepairController.java
index 5300af7..cf6b7f4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/repair/MesDvRepairController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/repair/MesDvRepairController.java
@@ -181,7 +181,7 @@
.build()
);
// 杈撳嚭
- ExcelUtils.write(response, "缁翠慨宸ュ崟瀵煎叆妯℃澘.xls", "缁翠慨宸ュ崟鍒楄〃", MesDvRepairImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "缁翠慨宸ュ崟瀵煎叆妯℃澘.xls", "缁翠慨宸ュ崟鍒楄〃", MesDvRepairImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java
index f63d3cb..2e5ee7d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java
@@ -123,7 +123,7 @@
.remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "璁捐椤圭洰瀵煎叆妯℃澘.xls", "璁捐椤圭洰鍒楄〃", MesPdProjectImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "璁捐椤圭洰瀵煎叆妯℃澘.xls", "璁捐椤圭洰鍒楄〃", MesPdProjectImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java
index c4aa5d3..d26fed6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java
@@ -207,7 +207,7 @@
.remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "鐢熶骇鎶ュ伐瀵煎叆妯℃澘.xls", "鐢熶骇鎶ュ伐鍒楄〃", MesProFeedbackImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鐢熶骇鎶ュ伐瀵煎叆妯℃澘.xls", "鐢熶骇鎶ュ伐鍒楄〃", MesProFeedbackImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/maintenancecalendar/MesProMaintenanceCalendarController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/maintenancecalendar/MesProMaintenanceCalendarController.java
index a9d4e57..cdcff5e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/maintenancecalendar/MesProMaintenanceCalendarController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/maintenancecalendar/MesProMaintenanceCalendarController.java
@@ -98,7 +98,7 @@
.name("8鏈堝彉鐢佃繍缁存帓鐝�").workDate(java.time.LocalDate.of(2026, 8, 20)).shift(1).workType(1)
.region("110kV 鍩庡尯绾�").teamName("鍙樼數杩愮淮涓�鐝�").personnel("寮犱笁,鏉庡洓").remark("").build()
);
- ExcelUtils.write(response, "鐢靛姏杩愮淮鏃ュ巻瀵煎叆妯℃澘.xls", "鐢靛姏杩愮淮鏃ュ巻鍒楄〃", MesProMaintenanceCalendarImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鐢靛姏杩愮淮鏃ュ巻瀵煎叆妯℃澘.xls", "鐢靛姏杩愮淮鏃ュ巻鍒楄〃", MesProMaintenanceCalendarImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/maintenanceplan/MesProMaintenancePlanController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/maintenanceplan/MesProMaintenancePlanController.java
index c2e3698..db37377 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/maintenanceplan/MesProMaintenancePlanController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/maintenanceplan/MesProMaintenancePlanController.java
@@ -114,7 +114,7 @@
.teamName("杩愮淮涓�鐝�").planDate(java.time.LocalDateTime.of(2026, 8, 1, 9, 0, 0))
.remark("").itemCode("").itemQuantity(new java.math.BigDecimal("10")).itemRemark("").build()
);
- ExcelUtils.write(response, "鐢靛姏浣滀笟璁″垝瀵煎叆妯℃澘.xls", "鐢靛姏浣滀笟璁″垝鍒楄〃", MesProMaintenancePlanImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鐢靛姏浣滀笟璁″垝瀵煎叆妯℃澘.xls", "鐢靛姏浣滀笟璁″垝鍒楄〃", MesProMaintenancePlanImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java
index 7537216..32c9bad 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java
@@ -117,7 +117,7 @@
.clientName("").requestDate(java.time.LocalDateTime.of(2026, 10, 16, 9, 0, 0))
.remark("").build()
);
- ExcelUtils.write(response, "鐢熶骇涓昏鍒掑鍏ユā鏉�.xls", "鐢熶骇涓昏鍒掑垪琛�", MesProMpsImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鐢熶骇涓昏鍒掑鍏ユā鏉�.xls", "鐢熶骇涓昏鍒掑垪琛�", MesProMpsImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderBomController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderBomController.java
index a777693..53fbdb1 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderBomController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderBomController.java
@@ -18,6 +18,8 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderBomDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderProcessDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
+import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstock.MesWmMaterialStockDO;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.materialstock.MesWmMaterialStockMapper;
import cn.iocoder.yudao.module.erp.api.purchase.PurchaseOrderApi;
@@ -51,6 +53,9 @@
@RequestMapping("/mes/pro/work-order-bom")
@Validated
public class MesProWorkOrderBomController {
+
+ @Resource
+ private MesProTaskService taskService;
@Resource
private MesProWorkOrderBomService workOrderBomService;
@@ -115,6 +120,18 @@
return success(new PageResult<>(buildWorkOrderBomRespVOList(pageResult.getList()), pageResult.getTotal()));
}
+ @GetMapping("/list-by-task-id")
+ @Operation(summary = "鑾峰緱鐢熶骇浠诲姟宸ュ簭鐨勬姇鍏ョ墿鏂�")
+ public CommonResult<List<MesProWorkOrderBomRespVO>> getWorkOrderBomListByTaskId(@RequestParam("taskId") Long taskId) {
+ MesProTaskDO task = taskService.validateTaskExists(taskId);
+ if (task.getWorkOrderId() == null || task.getProcessId() == null) {
+ return success(Collections.emptyList());
+ }
+ List<MesProWorkOrderBomDO> list = workOrderBomService.getWorkOrderBomListByWorkOrderId(task.getWorkOrderId())
+ .stream().filter(bom -> Objects.equals(bom.getProcessId(), task.getProcessId())).toList();
+ return success(buildWorkOrderBomRespVOList(list));
+ }
+
@GetMapping("/item-list-by-work-order-id")
@Operation(summary = "鑾峰緱宸ュ崟鐗╂枡闇�姹傚垪琛�")
@Parameter(name = "workOrderId", description = "宸ュ崟缂栧彿", required = true)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java
index f13dac7..fe36c14 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java
@@ -145,7 +145,7 @@
.remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "鐢熶骇宸ュ崟瀵煎叆妯℃澘.xls", "鐢熶骇宸ュ崟鍒楄〃", MesProWorkOrderImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鐢熶骇宸ュ崟瀵煎叆妯℃澘.xls", "鐢熶骇宸ュ崟鍒楄〃", MesProWorkOrderImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java
index 865257e..a809691 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java
@@ -191,7 +191,7 @@
.build()
);
// 杈撳嚭
- ExcelUtils.write(response, "杩囩▼妫�楠屽崟瀵煎叆妯℃澘.xls", "杩囩▼妫�楠屽崟鍒楄〃", MesQcIpqcImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "杩囩▼妫�楠屽崟瀵煎叆妯℃澘.xls", "杩囩▼妫�楠屽崟鍒楄〃", MesQcIpqcImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java
index e06a7e5..afe1c41 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java
@@ -176,7 +176,7 @@
.build()
);
// 杈撳嚭
- ExcelUtils.write(response, "鏉ユ枡妫�楠屽崟瀵煎叆妯℃澘.xls", "鏉ユ枡妫�楠屽崟鍒楄〃", MesQcIqcImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鏉ユ枡妫�楠屽崟瀵煎叆妯℃澘.xls", "鏉ユ枡妫�楠屽崟鍒楄〃", MesQcIqcImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/MesQcInspectionLedgerController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/MesQcInspectionLedgerController.java
new file mode 100644
index 0000000..6a43a0b
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/MesQcInspectionLedgerController.java
@@ -0,0 +1,113 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.ledger;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.dict.core.DictFrameworkUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo.MesQcInspectionLedgerExportVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo.MesQcInspectionLedgerPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo.MesQcInspectionLedgerRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcQualityExportVO;
+import cn.iocoder.yudao.module.mes.enums.DictTypeConstants;
+import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum;
+import cn.iocoder.yudao.module.mes.service.qc.ledger.MesQcInspectionLedgerService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "绠$悊鍚庡彴 - MES 妫�娴嬬粨鏋滃彴璐�")
+@RestController
+@RequestMapping("/mes/qc/inspection-ledger")
+@Validated
+public class MesQcInspectionLedgerController {
+
+ @Resource
+ private MesQcInspectionLedgerService ledgerService;
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱妫�娴嬬粨鏋滃彴璐﹀垎椤碉紙鍥涚被妫�楠屽崟缁熶竴鏌ヨ锛�")
+ @PreAuthorize("@ss.hasPermission('mes:qc-inspection-ledger:query')")
+ public CommonResult<PageResult<MesQcInspectionLedgerRespVO>> getInspectionLedgerPage(
+ @Valid MesQcInspectionLedgerPageReqVO pageReqVO) {
+ return success(ledgerService.getInspectionLedgerPage(pageReqVO));
+ }
+
+ @GetMapping("/export-excel")
+ @Operation(summary = "瀵煎嚭妫�娴嬬粨鏋滃彴璐� Excel")
+ @PreAuthorize("@ss.hasPermission('mes:qc-inspection-ledger:export')")
+ @ApiAccessLog(operateType = EXPORT)
+ public void exportInspectionLedgerExcel(@Valid MesQcInspectionLedgerPageReqVO pageReqVO,
+ HttpServletResponse response) throws IOException {
+ pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+ List<MesQcInspectionLedgerRespVO> list = ledgerService.getInspectionLedgerPage(pageReqVO).getList();
+ ExcelUtils.write(response, "妫�娴嬬粨鏋滃彴璐�.xls", "妫�娴嬬粨鏋滃彴璐�",
+ MesQcInspectionLedgerExportVO.class, buildExportList(list));
+ }
+
+ private List<MesQcInspectionLedgerExportVO> buildExportList(List<MesQcInspectionLedgerRespVO> list) {
+ if (CollUtil.isEmpty(list)) {
+ return new ArrayList<>();
+ }
+ List<MesQcInspectionLedgerExportVO> exportList = new ArrayList<>(list.size());
+ for (MesQcInspectionLedgerRespVO vo : list) {
+ MesQcInspectionLedgerExportVO export = new MesQcInspectionLedgerExportVO();
+ export.setQcTypeName(qcTypeName(vo.getQcType()));
+ export.setCode(vo.getCode());
+ export.setName(vo.getName());
+ export.setItemCode(vo.getItemCode());
+ export.setItemName(vo.getItemName());
+ export.setItemSpecification(vo.getItemSpecification());
+ export.setBatchNo(vo.getBatchNo());
+ export.setIndicatorName(vo.getIndicatorName());
+ export.setIndicatorValue(vo.getIndicatorValue());
+ export.setJudgementBasis(vo.getJudgementBasis());
+ export.setCheckResultText(parseDictLabel(DictTypeConstants.MES_QC_CHECK_RESULT, vo.getCheckResult()));
+ export.setCheckQuantity(MesQcQualityExportVO.formatDecimal(vo.getCheckQuantity()));
+ export.setQualifiedQuantity(MesQcQualityExportVO.formatDecimal(vo.getQualifiedQuantity()));
+ export.setUnqualifiedQuantity(MesQcQualityExportVO.formatDecimal(vo.getUnqualifiedQuantity()));
+ export.setInspectorName(vo.getInspectorName());
+ export.setInspectDate(MesQcQualityExportVO.formatDateTime(vo.getInspectDate()));
+ export.setStatusText(parseDictLabel(DictTypeConstants.MES_ORDER_STATUS, vo.getStatus()));
+ export.setRemark(vo.getRemark());
+ exportList.add(export);
+ }
+ return exportList;
+ }
+
+ private static String qcTypeName(Integer qcType) {
+ for (MesQcTypeEnum e : MesQcTypeEnum.values()) {
+ if (Objects.equals(e.getType(), qcType)) {
+ return e.getName();
+ }
+ }
+ return "";
+ }
+
+ private static String parseDictLabel(String dictType, Integer value) {
+ if (value == null) {
+ return "";
+ }
+ String label = DictFrameworkUtils.parseDictDataLabel(dictType, String.valueOf(value));
+ return StrUtil.nullToEmpty(label);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/vo/MesQcInspectionLedgerExportVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/vo/MesQcInspectionLedgerExportVO.java
new file mode 100644
index 0000000..6ea2e96
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/vo/MesQcInspectionLedgerExportVO.java
@@ -0,0 +1,70 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo;
+
+import cn.idev.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+/**
+ * MES 妫�娴嬬粨鏋滃彴璐﹀鍑� Excel VO
+ *
+ * <p>涓�琛� = 涓�涓娴嬮」缁撴灉锛堟楠屽崟鏈綍鍏ユ娴嬮」鏃惰鍗曞崰涓�琛岋紝妫�娴嬮」鐩稿叧鍒椾负绌猴級锛岀敤浜庢煡璇€�佹墦鍗颁笌瀛樻。銆�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Data
+public class MesQcInspectionLedgerExportVO {
+
+ @ExcelProperty("鍒嗙被")
+ private String qcTypeName;
+
+ @ExcelProperty("妫�楠屽崟缂栧彿")
+ private String code;
+
+ @ExcelProperty("妫�楠屽崟鍚嶇О")
+ private String name;
+
+ @ExcelProperty("鐗╂枡缂栫爜")
+ private String itemCode;
+
+ @ExcelProperty("鐗╂枡鍚嶇О")
+ private String itemName;
+
+ @ExcelProperty("瑙勬牸鍨嬪彿")
+ private String itemSpecification;
+
+ @ExcelProperty("鎵规鍙�")
+ private String batchNo;
+
+ @ExcelProperty("妫�娴嬮」")
+ private String indicatorName;
+
+ @ExcelProperty("妫�娴嬪��")
+ private String indicatorValue;
+
+ @ExcelProperty("鍒ゅ畾渚濇嵁")
+ private String judgementBasis;
+
+ @ExcelProperty("妫�娴嬬粨鏋�")
+ private String checkResultText;
+
+ @ExcelProperty("妫�娴嬫暟閲�")
+ private String checkQuantity;
+
+ @ExcelProperty("鍚堟牸鏁伴噺")
+ private String qualifiedQuantity;
+
+ @ExcelProperty("涓嶅悎鏍兼暟閲�")
+ private String unqualifiedQuantity;
+
+ @ExcelProperty("妫�娴嬩汉鍛�")
+ private String inspectorName;
+
+ @ExcelProperty("妫�娴嬫棩鏈�")
+ private String inspectDate;
+
+ @ExcelProperty("鍗曟嵁鐘舵��")
+ private String statusText;
+
+ @ExcelProperty("澶囨敞")
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/vo/MesQcInspectionLedgerPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/vo/MesQcInspectionLedgerPageReqVO.java
new file mode 100644
index 0000000..515b4a3
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/vo/MesQcInspectionLedgerPageReqVO.java
@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 妫�娴嬬粨鏋滃彴璐﹀垎椤� Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MesQcInspectionLedgerPageReqVO extends PageParam {
+
+ @Schema(description = "鍒嗙被锛堟楠岀被鍨嬶級锛�1 鏉ユ枡妫�楠� / 2 杩囩▼妫�楠� / 3 鍑鸿揣妫�楠� / 4 閫�璐ф楠岋紝涓嶄紶涓哄叏閮�", example = "1")
+ private Integer qcType;
+
+ @Schema(description = "妫�娴嬫棩鏈熷尯闂达紝浼� [寮�濮嬫椂闂�, 缁撴潫鏃堕棿]",
+ example = "[\"2026-01-01 00:00:00\", \"2026-12-31 23:59:59\"]")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime[] inspectDate;
+
+ @Schema(description = "妫�楠屽崟缂栧彿锛堟ā绯婂尮閰嶏級", example = "IQC1787563511197")
+ private String code;
+
+ @Schema(description = "鐗╂枡缂栧彿", example = "28")
+ private Long itemId;
+
+ @Schema(description = "鎵规鍙凤紙妯$硦鍖归厤锛涙潵鏂欐楠屽彇渚涘簲鍟嗘壒娆″彿锛屽嚭璐�/閫�璐ф楠屽彇鎵规鍙凤級", example = "20260920a")
+ private String batchNo;
+
+ @Schema(description = "妫�娴嬬粨鏋�", example = "1")
+ private Integer checkResult;
+
+ @Schema(description = "妫�娴嬩汉鍛樼紪鍙�", example = "1")
+ private Long inspectorUserId;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/vo/MesQcInspectionLedgerRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/vo/MesQcInspectionLedgerRespVO.java
new file mode 100644
index 0000000..5973032
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/vo/MesQcInspectionLedgerRespVO.java
@@ -0,0 +1,102 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 妫�娴嬬粨鏋滃彴璐� Response VO")
+@Data
+public class MesQcInspectionLedgerRespVO {
+
+ // ========== 妫�楠屽崟 ==========
+
+ @Schema(description = "鍒嗙被锛堟楠岀被鍨嬶級锛�1 鏉ユ枡妫�楠� / 2 杩囩▼妫�楠� / 3 鍑鸿揣妫�楠� / 4 閫�璐ф楠岋紱瀛楀吀 mes_qc_type", example = "1")
+ private Integer qcType;
+
+ @Schema(description = "妫�楠屽崟 ID", example = "1")
+ private Long qcId;
+
+ @Schema(description = "妫�楠屽崟缂栧彿", example = "IQC1787563511197")
+ private String code;
+
+ @Schema(description = "妫�楠屽崟鍚嶇О", example = "AN1787563511157-鐗╂枡妫�楠�")
+ private String name;
+
+ @Schema(description = "鍗曟嵁鐘舵�侊紱瀛楀吀 mes_order_status", example = "4")
+ private Integer status;
+
+ // ========== 鐗╂枡 ==========
+
+ @Schema(description = "鐗╂枡缂栧彿", example = "28")
+ private Long itemId;
+
+ @Schema(description = "鐗╂枡缂栫爜", example = "WL0001")
+ private String itemCode;
+
+ @Schema(description = "鐗╂枡鍚嶇О", example = "鐗╂枡A")
+ private String itemName;
+
+ @Schema(description = "瑙勬牸鍨嬪彿", example = "100mm*50mm")
+ private String itemSpecification;
+
+ @Schema(description = "璁¢噺鍗曚綅鍚嶇О", example = "涓�")
+ private String unitName;
+
+ @Schema(description = "鎵规鍙�", example = "20260920a")
+ private String batchNo;
+
+ // ========== 鏁伴噺涓庣粨鏋� ==========
+
+ @Schema(description = "妫�娴嬫暟閲�", example = "100.00")
+ private BigDecimal checkQuantity;
+
+ @Schema(description = "鍚堟牸鏁伴噺", example = "99.00")
+ private BigDecimal qualifiedQuantity;
+
+ @Schema(description = "涓嶅悎鏍兼暟閲�", example = "1.00")
+ private BigDecimal unqualifiedQuantity;
+
+ @Schema(description = "妫�娴嬬粨鏋滐紱瀛楀吀 mes_qc_check_result", example = "1")
+ private Integer checkResult;
+
+ @Schema(description = "妫�娴嬫棩鏈�")
+ private LocalDateTime inspectDate;
+
+ @Schema(description = "妫�娴嬩汉鍛樼紪鍙�", example = "1")
+ private Long inspectorUserId;
+
+ @Schema(description = "妫�娴嬩汉鍛樻樀绉�", example = "寮犱笁")
+ private String inspectorName;
+
+ // ========== 妫�娴嬮」缁撴灉锛堜竴鏉℃槑缁嗕竴琛岋紱妫�楠屽崟鏈綍鍏ユ娴嬮」鏃惰缁勫瓧娈典负绌猴級 ==========
+
+ @Schema(description = "妫�娴嬮」缂栧彿", example = "2")
+ private Long indicatorId;
+
+ @Schema(description = "妫�娴嬮」鍚嶇О", example = "闀垮害")
+ private String indicatorName;
+
+ @Schema(description = "妫�娴嬪��", example = "15")
+ private String indicatorValue;
+
+ @Schema(description = "妫�娴嬮」澶囨敞", example = "鎶芥")
+ private String indicatorRemark;
+
+ @Schema(description = "鍒ゅ畾渚濇嵁锛岀敱妫�娴嬮」鏍囧噯鍊�/璇樊涓婁笅闄愭嫾瑁�", example = "10~20")
+ private String judgementBasis;
+
+ @Schema(description = "妫�娴嬮」鏍囧噯鍊硷紙鍒ゅ畾渚濇嵁鍘熷鍊硷紝鍓嶇灞曠ず鐢� judgementBasis 鍗冲彲锛�", example = "15")
+ private BigDecimal standardValue;
+
+ @Schema(description = "妫�娴嬮」璇樊涓嬮檺锛堝垽瀹氫緷鎹師濮嬪�硷級", example = "10")
+ private BigDecimal minThreshold;
+
+ @Schema(description = "妫�娴嬮」璇樊涓婇檺锛堝垽瀹氫緷鎹師濮嬪�硷級", example = "20")
+ private BigDecimal maxThreshold;
+
+ @Schema(description = "妫�楠屽崟澶囨敞")
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java
index 96f482d..94b5d80 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java
@@ -172,7 +172,7 @@
.build()
);
// 杈撳嚭
- ExcelUtils.write(response, "鍑鸿揣妫�楠屽崟瀵煎叆妯℃澘.xls", "鍑鸿揣妫�楠屽崟鍒楄〃", MesQcOqcImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鍑鸿揣妫�楠屽崟瀵煎叆妯℃澘.xls", "鍑鸿揣妫�楠屽崟鍒楄〃", MesQcOqcImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/outsourcetest/MesQcOutsourceTestController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/outsourcetest/MesQcOutsourceTestController.java
index dd68aa4..98fcd85 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/outsourcetest/MesQcOutsourceTestController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/outsourcetest/MesQcOutsourceTestController.java
@@ -143,7 +143,7 @@
.build()
);
// 杈撳嚭
- ExcelUtils.write(response, "濮斿妫�娴嬭瘯楠屽崟瀵煎叆妯℃澘.xls", "濮斿妫�娴嬭瘯楠屽崟鍒楄〃", MesQcOutsourceTestImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "濮斿妫�娴嬭瘯楠屽崟瀵煎叆妯℃澘.xls", "濮斿妫�娴嬭瘯楠屽崟鍒楄〃", MesQcOutsourceTestImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java
index 93f37ef..cc08ae1 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java
@@ -161,7 +161,7 @@
.build()
);
// 杈撳嚭
- ExcelUtils.write(response, "閫�璐ф楠屽崟瀵煎叆妯℃澘.xls", "閫�璐ф楠屽崟鍒楄〃", MesQcRqcImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "閫�璐ф楠屽崟瀵煎叆妯℃澘.xls", "閫�璐ф楠屽崟鍒楄〃", MesQcRqcImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcImportRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcImportRespVO.java
new file mode 100644
index 0000000..273b3e6
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcImportRespVO.java
@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 绠$悊鍚庡彴 - 璐ㄦ鍗曞鍏� Response VO锛圛QC / IPQC / OQC 鍏辩敤锛�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 璐ㄦ鍗曞鍏� Response VO")
+@Data
+@Builder
+public class MesQcImportRespVO {
+
+ @Schema(description = "瀵煎叆鎴愬姛鐨勬楠屽崟缂栧彿鏁扮粍", example = "IQC20260101000001")
+ private List<String> createList;
+
+ @Schema(description = "瀵煎叆澶辫触闆嗗悎锛宬ey 涓鸿鏍囪瘑锛堟楠屽崟缂栧彿鎴栫 N 琛岋級锛寁alue 涓哄け璐ュ師鍥�")
+ private Map<String, String> failureList;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcQualityExportVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcQualityExportVO.java
new file mode 100644
index 0000000..26ee09a
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcQualityExportVO.java
@@ -0,0 +1,92 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.vo;
+
+import cn.idev.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * MES 璐ㄦ妫�楠屽崟瀵煎嚭 Excel VO锛圛QC/IPQC/OQC/RQC 鍏辩敤锛�
+ *
+ * <p>瀵煎嚭鍒楋細妫�楠屽崟鍚嶇О / 鐗╂枡鍚嶇О / 鎵瑰彿 / 妫�娴嬫棩鏈� / 妫�楠屾寚鏍� / 鍒ゅ畾渚濇嵁 / 妫�楠岀粨鏋� / 妫�楠屼汉 / 瀹℃牳浜� / 澶囨敞銆�
+ * 妫�楠屾寚鏍囥�佸垽瀹氫緷鎹彇鑷楠屽崟琛屾槑缁嗭紱瀹℃牳浜烘殏鏃犳暟鎹潵婧愶紝瀵煎嚭涓虹┖鍒椼��
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Data
+public class MesQcQualityExportVO {
+
+ @ExcelProperty("妫�楠屽崟鍚嶇О")
+ private String docName;
+
+ @ExcelProperty("鐗╂枡鍚嶇О")
+ private String itemName;
+
+ @ExcelProperty("鎵瑰彿")
+ private String batchNo;
+
+ @ExcelProperty("妫�娴嬫棩鏈�")
+ private String inspectDate;
+
+ @ExcelProperty("妫�楠屾寚鏍�")
+ private String indicatorNames;
+
+ @ExcelProperty("鍒ゅ畾渚濇嵁")
+ private String judgementBasis;
+
+ @ExcelProperty("妫�楠岀粨鏋�")
+ private String checkResultText;
+
+ @ExcelProperty("妫�楠屼汉")
+ private String inspectorName;
+
+ @ExcelProperty("瀹℃牳浜�")
+ private String auditorName;
+
+ @ExcelProperty("澶囨敞")
+ private String remark;
+
+ /**
+ * 鏍煎紡鍖栨娴嬫棩鏈燂紙浠呮棩鏈燂級锛宯ull 杩斿洖绌轰覆
+ */
+ public static String formatDateTime(LocalDateTime dateTime) {
+ if (dateTime == null) {
+ return "";
+ }
+ return dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ }
+
+ /**
+ * 鍘绘帀鏁板�煎熬閮ㄦ棤鎰忎箟鐨� 0锛屽 35.000000 -> 35銆�2.500000 -> 2.5
+ */
+ public static String formatDecimal(BigDecimal value) {
+ if (value == null) {
+ return "";
+ }
+ return value.stripTrailingZeros().toPlainString();
+ }
+
+ /**
+ * 缁勮鍗曚釜妫�娴嬮」鐨勫垽瀹氫緷鎹枃鏈細
+ * 涓婁笅闄愬潎鏈� -> "涓嬮檺~涓婇檺"锛涗粎鏈変笂闄� -> "鈮や笂闄�"锛涗粎鏈変笅闄� -> "鈮ヤ笅闄�"锛�
+ * 鍧囨棤浣嗙粰浜嗘爣鍑嗗�� -> "鏍囧噯鍊� 鏍囧噯鍊�"锛涘惁鍒欒繑鍥炵┖涓层��
+ */
+ public static String buildRangeText(BigDecimal standardValue, BigDecimal minThreshold, BigDecimal maxThreshold) {
+ if (maxThreshold != null && minThreshold != null) {
+ return formatDecimal(minThreshold) + "~" + formatDecimal(maxThreshold);
+ }
+ if (maxThreshold != null) {
+ return "鈮�" + formatDecimal(maxThreshold);
+ }
+ if (minThreshold != null) {
+ return "鈮�" + formatDecimal(minThreshold);
+ }
+ if (standardValue != null) {
+ return "鏍囧噯鍊� " + formatDecimal(standardValue);
+ }
+ return "";
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyCertificateController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyCertificateController.java
new file mode 100644
index 0000000..5ad6c65
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyCertificateController.java
@@ -0,0 +1,98 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert.SafetyCertificatePageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert.SafetyCertificateRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert.SafetyCertificateSaveReqVO;
+import cn.iocoder.yudao.module.mes.service.safety.SafetyCertificateService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗圭浣滀笟璇佸彴璐︼紙鍚埌鏈熻嚜鍔ㄩ璀︼級
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Tag(name = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-鐗圭浣滀笟璇�")
+@RestController
+@RequestMapping("/safety/certificate")
+@Validated
+public class SafetyCertificateController {
+
+ @Resource
+ private SafetyCertificateService certificateService;
+
+ @PostMapping("/create")
+ @Operation(summary = "鏂板鐗圭浣滀笟璇�")
+ @PreAuthorize("@ss.hasPermission('safety:cert:create')")
+ public CommonResult<Long> create(@Valid @RequestBody SafetyCertificateSaveReqVO reqVO) {
+ return success(certificateService.createCertificate(reqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "淇敼鐗圭浣滀笟璇�")
+ @PreAuthorize("@ss.hasPermission('safety:cert:update')")
+ public CommonResult<Boolean> update(@Valid @RequestBody SafetyCertificateSaveReqVO reqVO) {
+ certificateService.updateCertificate(reqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎鐗圭浣滀笟璇�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:cert:delete')")
+ public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
+ certificateService.deleteCertificate(id);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱鐗圭浣滀笟璇�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:cert:query')")
+ public CommonResult<SafetyCertificateRespVO> get(@RequestParam("id") Long id) {
+ var cert = certificateService.getCertificate(id);
+ var resp = BeanUtils.toBean(cert, SafetyCertificateRespVO.class);
+ certificateService.fillDisplayFields(cert, resp);
+ return success(resp);
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱鐗圭浣滀笟璇佸垎椤�")
+ @PreAuthorize("@ss.hasPermission('safety:cert:query')")
+ public CommonResult<PageResult<SafetyCertificateRespVO>> page(@Valid SafetyCertificatePageReqVO reqVO) {
+ var page = certificateService.getCertificatePage(reqVO);
+ // 鎵归噺琛ュ叏鎸佽瘉浜烘渶鏂版。妗堬紙濮撳悕/宸ュ彿/閮ㄩ棬锛夛紝涓�娆℃�ф煡濂介伩鍏� N+1
+ certificateService.fillEmployeeInfo(page.getList());
+ var result = BeanUtils.toBean(page, SafetyCertificateRespVO.class);
+ certificateService.fillDisplayFieldsBatch(page.getList(), result.getList());
+ return success(result);
+ }
+
+ @GetMapping("/expiring-list")
+ @Operation(summary = "鑾峰緱鍗冲皢鍒版湡/宸茶繃鏈熺殑鐗圭浣滀笟璇侊紙鍒版湡鑷姩棰勮锛�")
+ @Parameter(name = "days", description = "鎻愬墠棰勮澶╂暟锛岄粯璁� 30 澶�")
+ @PreAuthorize("@ss.hasPermission('safety:cert:query')")
+ public CommonResult<List<SafetyCertificateRespVO>> expiringList(
+ @RequestParam(value = "days", required = false) Integer days) {
+ List<cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyCertificateDO> certs =
+ certificateService.getExpiringCertificates(days);
+ certificateService.fillEmployeeInfo(certs);
+ var resps = BeanUtils.toBean(certs, SafetyCertificateRespVO.class);
+ certificateService.fillDisplayFieldsBatch(certs, resps);
+ return success(resps);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyFileController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyFileController.java
new file mode 100644
index 0000000..f2b6c07
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyFileController.java
@@ -0,0 +1,53 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.mes.service.safety.SafetyFileService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import org.springframework.http.MediaType;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 瀹夊叏鐢熶骇 - 绉诲姩绔幇鍦烘媿鐓т笂浼�
+ *
+ * <p>宸℃銆侀殣鎮d笂鎶ャ�佷綔涓氱エ銆佹紨缁冪瓑鐜妭鐨勭収鐗囩粺涓�璧版鎺ュ彛锛�
+ * 杩斿洖鍙闂� URL锛屽墠绔嫾鎴愰�楀彿涓插啓鍏ヤ笟鍔¤〃銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Tag(name = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-闄勪欢涓婁紶")
+@RestController
+@RequestMapping("/safety/file")
+@Validated
+public class SafetyFileController {
+
+ @Resource
+ private SafetyFileService fileService;
+
+ @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ @Operation(summary = "涓婁紶鍗曚釜闄勪欢锛堢Щ鍔ㄧ鎷嶇収锛�")
+ @Parameter(name = "file", description = "鏂囦欢", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:file:upload')")
+ public CommonResult<String> upload(@RequestPart("file") MultipartFile file,
+ @RequestParam(value = "bizType", required = false) String bizType) {
+ return success(fileService.upload(file, bizType));
+ }
+
+ @PostMapping(value = "/upload-batch", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ @Operation(summary = "鎵归噺涓婁紶闄勪欢锛堢Щ鍔ㄧ涓�娆″寮狅級")
+ @PreAuthorize("@ss.hasPermission('safety:file:upload')")
+ public CommonResult<List<String>> uploadBatch(@RequestPart("files") List<MultipartFile> files,
+ @RequestParam(value = "bizType", required = false) String bizType) {
+ return success(fileService.uploadBatch(files, bizType));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyHazardController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyHazardController.java
new file mode 100644
index 0000000..a959252
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyHazardController.java
@@ -0,0 +1,106 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard.*;
+import cn.iocoder.yudao.module.mes.service.safety.SafetyHazardService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅涓婃姤涓庨棴鐜紙涓婃姤-鍒嗘淳-鏁存敼-澶嶆煡锛�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Tag(name = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-闅愭偅闂幆")
+@RestController
+@RequestMapping("/safety/hazard")
+@Validated
+public class SafetyHazardController {
+
+ @Resource
+ private SafetyHazardService hazardService;
+
+ @PostMapping("/create")
+ @Operation(summary = "闅愭偅涓婃姤锛堟敮鎸佺Щ鍔ㄧ鎷嶇収涓婁紶鐨� photoUrls锛�")
+ @PreAuthorize("@ss.hasPermission('safety:hazard:create')")
+ public CommonResult<Long> create(@Valid @RequestBody SafetyHazardSaveReqVO reqVO) {
+ return success(hazardService.createHazard(reqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "淇敼闅愭偅鍩虹淇℃伅")
+ @PreAuthorize("@ss.hasPermission('safety:hazard:update')")
+ public CommonResult<Boolean> update(@Valid @RequestBody SafetyHazardSaveReqVO reqVO) {
+ hazardService.updateHazard(reqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎闅愭偅")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:hazard:delete')")
+ public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
+ hazardService.deleteHazard(id);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱闅愭偅")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:hazard:query')")
+ public CommonResult<SafetyHazardRespVO> get(@RequestParam("id") Long id) {
+ var hazard = hazardService.getHazard(id);
+ hazardService.fillPersonNames(java.util.List.of(hazard));
+ var resp = BeanUtils.toBean(hazard, SafetyHazardRespVO.class);
+ SafetyHazardService.fillHazardDisplay(hazard, resp);
+ return success(resp);
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱闅愭偅鍒嗛〉")
+ @PreAuthorize("@ss.hasPermission('safety:hazard:query')")
+ public CommonResult<PageResult<SafetyHazardRespVO>> page(@Valid SafetyHazardPageReqVO reqVO) {
+ var page = hazardService.getHazardPage(reqVO);
+ hazardService.fillPersonNames(page.getList());
+ var result = BeanUtils.toBean(page, SafetyHazardRespVO.class);
+ for (int i = 0; i < page.getList().size(); i++) {
+ SafetyHazardService.fillHazardDisplay(page.getList().get(i), result.getList().get(i));
+ }
+ return success(result);
+ }
+
+ @PutMapping("/assign")
+ @Operation(summary = "鍒嗘淳闅愭偅鏁存敼璐d换浜�")
+ @PreAuthorize("@ss.hasPermission('safety:hazard:assign')")
+ public CommonResult<Boolean> assign(@Valid @RequestBody SafetyHazardAssignReqVO reqVO) {
+ hazardService.assignHazard(reqVO);
+ return success(true);
+ }
+
+ @PutMapping("/rectify")
+ @Operation(summary = "鎻愪氦闅愭偅鏁存敼缁撴灉")
+ @PreAuthorize("@ss.hasPermission('safety:hazard:rectify')")
+ public CommonResult<Boolean> rectify(@Valid @RequestBody SafetyHazardRectifyReqVO reqVO) {
+ hazardService.rectifyHazard(reqVO);
+ return success(true);
+ }
+
+ @PutMapping("/recheck")
+ @Operation(summary = "闅愭偅澶嶆煡锛堥�氳繃鍒欓棴鐜紝涓嶉�氳繃閫�鍥炴暣鏀癸級")
+ @PreAuthorize("@ss.hasPermission('safety:hazard:recheck')")
+ public CommonResult<Boolean> recheck(@Valid @RequestBody SafetyHazardRecheckReqVO reqVO) {
+ hazardService.recheckHazard(reqVO);
+ return success(true);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyInspectionController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyInspectionController.java
new file mode 100644
index 0000000..f66b4da
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyInspectionController.java
@@ -0,0 +1,162 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.inspection.*;
+import cn.iocoder.yudao.module.mes.service.safety.SafetyInspectionService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃鐐逛綅涓庡贰妫�璁板綍
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Tag(name = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-瀹夊叏宸℃")
+@RestController
+@RequestMapping("/safety/inspection")
+@Validated
+public class SafetyInspectionController {
+
+ @Resource
+ private SafetyInspectionService inspectionService;
+
+ // ==================== 宸℃鐐逛綅 ====================
+
+ @PostMapping("/point/create")
+ @Operation(summary = "鏂板宸℃鐐逛綅")
+ @PreAuthorize("@ss.hasPermission('safety:inspection-point:create')")
+ public CommonResult<Long> createPoint(@Valid @RequestBody SafetyInspectionPointSaveReqVO reqVO) {
+ return success(inspectionService.createPoint(reqVO));
+ }
+
+ @PutMapping("/point/update")
+ @Operation(summary = "淇敼宸℃鐐逛綅")
+ @PreAuthorize("@ss.hasPermission('safety:inspection-point:update')")
+ public CommonResult<Boolean> updatePoint(@Valid @RequestBody SafetyInspectionPointSaveReqVO reqVO) {
+ inspectionService.updatePoint(reqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/point/delete")
+ @Operation(summary = "鍒犻櫎宸℃鐐逛綅")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:inspection-point:delete')")
+ public CommonResult<Boolean> deletePoint(@RequestParam("id") Long id) {
+ inspectionService.deletePoint(id);
+ return success(true);
+ }
+
+ @GetMapping("/point/get")
+ @Operation(summary = "鑾峰緱宸℃鐐逛綅")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:inspection-point:query')")
+ public CommonResult<SafetyInspectionPointRespVO> getPoint(@RequestParam("id") Long id) {
+ var point = inspectionService.getPoint(id);
+ // 鍗曟潯鏌ヨ涔熻鍥炲~涓绘暟鎹渶鏂板�硷紝涓嶈兘鍙繑鍥炲揩鐓�
+ inspectionService.fillPointRefs(java.util.List.of(point));
+ var resp = BeanUtils.toBean(point, SafetyInspectionPointRespVO.class);
+ SafetyInspectionService.fillPointDisplay(point, resp);
+ resp.setLastInspectTime(inspectionService.getLastInspectTime(id));
+ return success(resp);
+ }
+
+ @GetMapping("/point/page")
+ @Operation(summary = "鑾峰緱宸℃鐐逛綅鍒嗛〉")
+ @PreAuthorize("@ss.hasPermission('safety:inspection-point:query')")
+ public CommonResult<PageResult<SafetyInspectionPointRespVO>> getPointPage(
+ @Valid SafetyInspectionPointPageReqVO reqVO) {
+ var page = inspectionService.getPointPage(reqVO);
+ inspectionService.fillPointRefs(page.getList());
+ var result = BeanUtils.toBean(page, SafetyInspectionPointRespVO.class);
+ for (int i = 0; i < page.getList().size(); i++) {
+ SafetyInspectionService.fillPointDisplay(page.getList().get(i), result.getList().get(i));
+ }
+ return success(result);
+ }
+
+ @GetMapping("/point/simple-list")
+ @Operation(summary = "鑾峰緱鍚敤涓殑宸℃鐐逛綅绮剧畝鍒楄〃锛堢Щ鍔ㄧ宸℃閫夋嫨锛�")
+ @PreAuthorize("@ss.hasPermission('safety:inspection-point:query')")
+ public CommonResult<List<SafetyInspectionPointRespVO>> getPointSimpleList() {
+ var points = inspectionService.getEnabledPointList();
+ inspectionService.fillPointRefs(points);
+ List<SafetyInspectionPointRespVO> list = points.stream()
+ .map(point -> {
+ var resp = BeanUtils.toBean(point, SafetyInspectionPointRespVO.class);
+ SafetyInspectionService.fillPointDisplay(point, resp);
+ return resp;
+ }).toList();
+ return success(list);
+ }
+
+ // ==================== 宸℃璁板綍 ====================
+
+ @PostMapping("/record/create")
+ @Operation(summary = "鏂板宸℃璁板綍")
+ @PreAuthorize("@ss.hasPermission('safety:inspection:create')")
+ public CommonResult<Long> createRecord(@Valid @RequestBody SafetyInspectionSaveReqVO reqVO) {
+ return success(inspectionService.createInspection(reqVO));
+ }
+
+ @PutMapping("/record/update")
+ @Operation(summary = "淇敼宸℃璁板綍")
+ @PreAuthorize("@ss.hasPermission('safety:inspection:update')")
+ public CommonResult<Boolean> updateRecord(@Valid @RequestBody SafetyInspectionSaveReqVO reqVO) {
+ inspectionService.updateInspection(reqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/record/delete")
+ @Operation(summary = "鍒犻櫎宸℃璁板綍")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:inspection:delete')")
+ public CommonResult<Boolean> deleteRecord(@RequestParam("id") Long id) {
+ inspectionService.deleteInspection(id);
+ return success(true);
+ }
+
+ @GetMapping("/record/get")
+ @Operation(summary = "鑾峰緱宸℃璁板綍")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:inspection:query')")
+ public CommonResult<SafetyInspectionRespVO> getRecord(@RequestParam("id") Long id) {
+ var record = inspectionService.getInspection(id);
+ inspectionService.fillInspectorNames(java.util.List.of(record));
+ var resp = BeanUtils.toBean(record, SafetyInspectionRespVO.class);
+ resp.setPointTypeName(cn.iocoder.yudao.module.mes.enums.safety.SafetyInspectionPointTypeEnum
+ .getNameByType(record.getPointType()));
+ resp.setResultName("NORMAL".equals(record.getResult()) ? "姝e父" : "寮傚父");
+ return success(resp);
+ }
+
+ @GetMapping("/record/page")
+ @Operation(summary = "鑾峰緱宸℃璁板綍鍒嗛〉")
+ @PreAuthorize("@ss.hasPermission('safety:inspection:query')")
+ public CommonResult<PageResult<SafetyInspectionRespVO>> getRecordPage(
+ @Valid SafetyInspectionPageReqVO reqVO) {
+ var page = inspectionService.getInspectionPage(reqVO);
+ inspectionService.fillInspectorNames(page.getList());
+ var result = BeanUtils.toBean(page, SafetyInspectionRespVO.class);
+ for (int i = 0; i < page.getList().size(); i++) {
+ var record = page.getList().get(i);
+ var resp = result.getList().get(i);
+ resp.setPointTypeName(cn.iocoder.yudao.module.mes.enums.safety.SafetyInspectionPointTypeEnum
+ .getNameByType(record.getPointType()));
+ resp.setResultName("NORMAL".equals(record.getResult()) ? "姝e父" : "寮傚父");
+ }
+ return success(result);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyLedgerController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyLedgerController.java
new file mode 100644
index 0000000..b2ea3ae
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyLedgerController.java
@@ -0,0 +1,53 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ledger.SafetyLedgerExportReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ledger.SafetyOverviewRespVO;
+import cn.iocoder.yudao.module.mes.service.safety.SafetyLedgerExportService;
+import cn.iocoder.yudao.module.mes.service.safety.SafetyOverviewService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鎬昏缁熻涓庢爣鍑嗗寲鍙拌处瀵煎嚭
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Tag(name = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-鍙拌处涓庣粺璁�")
+@RestController
+@RequestMapping("/safety/ledger")
+@Validated
+public class SafetyLedgerController {
+
+ @Resource
+ private SafetyOverviewService overviewService;
+ @Resource
+ private SafetyLedgerExportService ledgerExportService;
+
+ @GetMapping("/overview")
+ @Operation(summary = "鑾峰緱瀹夊叏鐢熶骇鎬昏缁熻")
+ @PreAuthorize("@ss.hasPermission('safety:ledger:query')")
+ public CommonResult<SafetyOverviewRespVO> overview() {
+ return success(overviewService.getOverview());
+ }
+
+ @GetMapping("/export")
+ @Operation(summary = "瀵煎嚭鐢靛姏琛屼笟瀹夊叏鏍囧噯鍖栧彴璐︼紙鍏ㄥ鎴栧閫夊叾涓�锛�")
+ @PreAuthorize("@ss.hasPermission('safety:ledger:export')")
+ public void export(@Valid SafetyLedgerExportReqVO reqVO, HttpServletResponse response) throws IOException {
+ ledgerExportService.export(reqVO, response);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyMaterialController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyMaterialController.java
new file mode 100644
index 0000000..3bed64b
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyMaterialController.java
@@ -0,0 +1,138 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.material.*;
+import cn.iocoder.yudao.module.mes.service.safety.SafetyMaterialService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 瀹夊叏鐢熶骇 - 搴旀�ョ墿璧勫彴璐︿笌鍑哄叆搴擄紙缁濈紭鐢ㄥ叿 / 鍗卞寲鍝� / 娑堥槻鐗╄祫锛�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Tag(name = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-搴旀�ョ墿璧�")
+@RestController
+@RequestMapping("/safety/material")
+@Validated
+public class SafetyMaterialController {
+
+ @Resource
+ private SafetyMaterialService materialService;
+
+ @PostMapping("/create")
+ @Operation(summary = "鏂板鐗╄祫")
+ @PreAuthorize("@ss.hasPermission('safety:material:create')")
+ public CommonResult<Long> create(@Valid @RequestBody SafetyMaterialSaveReqVO reqVO) {
+ return success(materialService.createMaterial(reqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "淇敼鐗╄祫锛堝簱瀛樻暟閲忓彧鑳介�氳繃鍑哄叆搴撳彉鍔級")
+ @PreAuthorize("@ss.hasPermission('safety:material:update')")
+ public CommonResult<Boolean> update(@Valid @RequestBody SafetyMaterialSaveReqVO reqVO) {
+ materialService.updateMaterial(reqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎鐗╄祫")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:material:delete')")
+ public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
+ materialService.deleteMaterial(id);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱鐗╄祫")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:material:query')")
+ public CommonResult<SafetyMaterialRespVO> get(@RequestParam("id") Long id) {
+ var material = materialService.getMaterial(id);
+ materialService.fillManagers(java.util.List.of(material));
+ var resp = BeanUtils.toBean(material, SafetyMaterialRespVO.class);
+ SafetyMaterialService.fillMaterialDisplay(material, resp);
+ return success(resp);
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱鐗╄祫鍒嗛〉")
+ @PreAuthorize("@ss.hasPermission('safety:material:query')")
+ public CommonResult<PageResult<SafetyMaterialRespVO>> page(@Valid SafetyMaterialPageReqVO reqVO) {
+ var page = materialService.getMaterialPage(reqVO);
+ materialService.fillManagers(page.getList());
+ var result = BeanUtils.toBean(page, SafetyMaterialRespVO.class);
+ for (int i = 0; i < page.getList().size(); i++) {
+ SafetyMaterialService.fillMaterialDisplay(page.getList().get(i), result.getList().get(i));
+ }
+ return success(result);
+ }
+
+ @GetMapping("/below-safe-stock")
+ @Operation(summary = "鑾峰緱浣庝簬瀹夊叏搴撳瓨鐨勭墿璧勫垪琛紙棰勮锛�")
+ @PreAuthorize("@ss.hasPermission('safety:material:query')")
+ public CommonResult<List<SafetyMaterialRespVO>> belowSafeStock() {
+ var materials = materialService.getBelowSafeStockList();
+ materialService.fillManagers(materials);
+ List<SafetyMaterialRespVO> list = materials.stream()
+ .map(material -> {
+ var resp = BeanUtils.toBean(material, SafetyMaterialRespVO.class);
+ SafetyMaterialService.fillMaterialDisplay(material, resp);
+ return resp;
+ }).toList();
+ return success(list);
+ }
+
+ @GetMapping("/expiring-list")
+ @Operation(summary = "鑾峰緱鍗冲皢鍒版湡鐨勭墿璧勫垪琛紙棰勮锛�")
+ @Parameter(name = "days", description = "鎻愬墠棰勮澶╂暟锛岄粯璁� 30 澶�")
+ @PreAuthorize("@ss.hasPermission('safety:material:query')")
+ public CommonResult<List<SafetyMaterialRespVO>> expiringList(
+ @RequestParam(value = "days", required = false) Integer days) {
+ var materials = materialService.getExpiringList(days);
+ materialService.fillManagers(materials);
+ List<SafetyMaterialRespVO> list = materials.stream()
+ .map(material -> {
+ var resp = BeanUtils.toBean(material, SafetyMaterialRespVO.class);
+ SafetyMaterialService.fillMaterialDisplay(material, resp);
+ return resp;
+ }).toList();
+ return success(list);
+ }
+
+ // ==================== 鍑哄叆搴� ====================
+
+ @PostMapping("/stock/create")
+ @Operation(summary = "鍑哄叆搴撶櫥璁帮紙鑷姩鏇存柊搴撳瓨锛�")
+ @PreAuthorize("@ss.hasPermission('safety:material-stock:in') or @ss.hasPermission('safety:material-stock:out')")
+ public CommonResult<Long> createStock(@Valid @RequestBody SafetyMaterialStockSaveReqVO reqVO) {
+ return success(materialService.createStock(reqVO));
+ }
+
+ @GetMapping("/stock/page")
+ @Operation(summary = "鑾峰緱鍑哄叆搴撴祦姘村垎椤�")
+ @PreAuthorize("@ss.hasPermission('safety:material-stock:query')")
+ public CommonResult<PageResult<SafetyMaterialStockRespVO>> stockPage(
+ @Valid SafetyMaterialStockPageReqVO reqVO) {
+ var page = materialService.getStockPage(reqVO);
+ var result = BeanUtils.toBean(page, SafetyMaterialStockRespVO.class);
+ for (int i = 0; i < page.getList().size(); i++) {
+ SafetyMaterialService.fillStockDisplay(page.getList().get(i), result.getList().get(i));
+ }
+ return success(result);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyOrgController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyOrgController.java
new file mode 100644
index 0000000..60bbf5a
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyOrgController.java
@@ -0,0 +1,99 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.org.SafetyOrgRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.org.SafetyOrgSaveReqVO;
+import cn.iocoder.yudao.module.mes.service.safety.SafetyOrgService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 瀹夊叏鐢熶骇 - 瀹夊叏缁勭粐鏋舵瀯
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Tag(name = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-缁勭粐鏋舵瀯")
+@RestController
+@RequestMapping("/safety/org")
+@Validated
+public class SafetyOrgController {
+
+ @Resource
+ private SafetyOrgService orgService;
+
+ @PostMapping("/create")
+ @Operation(summary = "鏂板瀹夊叏缁勭粐")
+ @PreAuthorize("@ss.hasPermission('safety:org:create')")
+ public CommonResult<Long> create(@Valid @RequestBody SafetyOrgSaveReqVO reqVO) {
+ return success(orgService.createOrg(reqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "淇敼瀹夊叏缁勭粐")
+ @PreAuthorize("@ss.hasPermission('safety:org:update')")
+ public CommonResult<Boolean> update(@Valid @RequestBody SafetyOrgSaveReqVO reqVO) {
+ orgService.updateOrg(reqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎瀹夊叏缁勭粐")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:org:delete')")
+ public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
+ orgService.deleteOrg(id);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱瀹夊叏缁勭粐")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:org:query')")
+ public CommonResult<SafetyOrgRespVO> get(@RequestParam("id") Long id) {
+ var org = orgService.getOrg(id);
+ var resp = new SafetyOrgRespVO();
+ org2resp(org, resp);
+ // 璐熻矗浜虹敤鍛樺伐妗f鏈�鏂板鍚嶈鐩栧揩鐓�
+ if (org.getLeaderId() != null) {
+ var employee = orgService.getLeader(org.getLeaderId());
+ if (employee != null) {
+ resp.setLeaderName(employee.getName());
+ resp.setLeaderPhone(employee.getPhone());
+ }
+ }
+ return success(resp);
+ }
+
+ @GetMapping("/tree")
+ @Operation(summary = "鑾峰緱瀹夊叏缁勭粐鏍�")
+ @PreAuthorize("@ss.hasPermission('safety:org:query')")
+ public CommonResult<List<SafetyOrgRespVO>> tree() {
+ return success(orgService.getOrgTree());
+ }
+
+ private static void org2resp(cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyOrgDO org,
+ SafetyOrgRespVO resp) {
+ resp.setId(org.getId());
+ resp.setParentId(org.getParentId());
+ resp.setName(org.getName());
+ resp.setLeaderName(org.getLeaderName());
+ resp.setLeaderPhone(org.getLeaderPhone());
+ resp.setMemberNames(org.getMemberNames());
+ resp.setDuty(org.getDuty());
+ resp.setSort(org.getSort());
+ resp.setStatus(org.getStatus());
+ resp.setRemark(org.getRemark());
+ resp.setCreateTime(org.getCreateTime());
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyTrainingController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyTrainingController.java
new file mode 100644
index 0000000..9664231
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyTrainingController.java
@@ -0,0 +1,187 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train.*;
+import cn.iocoder.yudao.module.mes.service.safety.SafetyTrainingService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鍩硅銆佹紨缁冦�佷簨鏁呯櫥璁扮數瀛愬寲褰掓。
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Tag(name = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-鍩硅涓庝簨鏁�")
+@RestController
+@RequestMapping("/safety/training")
+@Validated
+public class SafetyTrainingController {
+
+ @Resource
+ private SafetyTrainingService trainingService;
+
+ // ==================== 鍩硅 ====================
+
+ @PostMapping("/create")
+ @Operation(summary = "鏂板瀹夊叏鍩硅璁板綍")
+ @PreAuthorize("@ss.hasPermission('safety:training:create')")
+ public CommonResult<Long> create(@Valid @RequestBody SafetyTrainingSaveReqVO reqVO) {
+ return success(trainingService.createTraining(reqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "淇敼瀹夊叏鍩硅璁板綍")
+ @PreAuthorize("@ss.hasPermission('safety:training:update')")
+ public CommonResult<Boolean> update(@Valid @RequestBody SafetyTrainingSaveReqVO reqVO) {
+ trainingService.updateTraining(reqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎瀹夊叏鍩硅璁板綍")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:training:delete')")
+ public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
+ trainingService.deleteTraining(id);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱瀹夊叏鍩硅璁板綍")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:training:query')")
+ public CommonResult<SafetyTrainingRespVO> get(@RequestParam("id") Long id) {
+ var training = trainingService.getTraining(id);
+ trainingService.fillTrainers(java.util.List.of(training));
+ var resp = BeanUtils.toBean(training, SafetyTrainingRespVO.class);
+ SafetyTrainingService.fillTrainingDisplay(training, resp);
+ return success(resp);
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱瀹夊叏鍩硅璁板綍鍒嗛〉")
+ @PreAuthorize("@ss.hasPermission('safety:training:query')")
+ public CommonResult<PageResult<SafetyTrainingRespVO>> page(@Valid SafetyTrainingPageReqVO reqVO) {
+ var page = trainingService.getTrainingPage(reqVO);
+ trainingService.fillTrainers(page.getList());
+ var result = BeanUtils.toBean(page, SafetyTrainingRespVO.class);
+ for (int i = 0; i < page.getList().size(); i++) {
+ SafetyTrainingService.fillTrainingDisplay(page.getList().get(i), result.getList().get(i));
+ }
+ return success(result);
+ }
+
+ // ==================== 婕旂粌 ====================
+
+ @PostMapping("/drill/create")
+ @Operation(summary = "鏂板娑堥槻婕旂粌璁板綍")
+ @PreAuthorize("@ss.hasPermission('safety:drill:create')")
+ public CommonResult<Long> createDrill(@Valid @RequestBody SafetyDrillSaveReqVO reqVO) {
+ return success(trainingService.createDrill(reqVO));
+ }
+
+ @PutMapping("/drill/update")
+ @Operation(summary = "淇敼娑堥槻婕旂粌璁板綍")
+ @PreAuthorize("@ss.hasPermission('safety:drill:update')")
+ public CommonResult<Boolean> updateDrill(@Valid @RequestBody SafetyDrillSaveReqVO reqVO) {
+ trainingService.updateDrill(reqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/drill/delete")
+ @Operation(summary = "鍒犻櫎娑堥槻婕旂粌璁板綍")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:drill:delete')")
+ public CommonResult<Boolean> deleteDrill(@RequestParam("id") Long id) {
+ trainingService.deleteDrill(id);
+ return success(true);
+ }
+
+ @GetMapping("/drill/get")
+ @Operation(summary = "鑾峰緱娑堥槻婕旂粌璁板綍")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:drill:query')")
+ public CommonResult<SafetyDrillRespVO> getDrill(@RequestParam("id") Long id) {
+ var drill = trainingService.getDrill(id);
+ trainingService.fillOrganizers(java.util.List.of(drill));
+ var resp = BeanUtils.toBean(drill, SafetyDrillRespVO.class);
+ SafetyTrainingService.fillDrillDisplay(drill, resp);
+ return success(resp);
+ }
+
+ @GetMapping("/drill/page")
+ @Operation(summary = "鑾峰緱娑堥槻婕旂粌璁板綍鍒嗛〉")
+ @PreAuthorize("@ss.hasPermission('safety:drill:query')")
+ public CommonResult<PageResult<SafetyDrillRespVO>> drillPage(@Valid SafetyDrillPageReqVO reqVO) {
+ var page = trainingService.getDrillPage(reqVO);
+ trainingService.fillOrganizers(page.getList());
+ var result = BeanUtils.toBean(page, SafetyDrillRespVO.class);
+ for (int i = 0; i < page.getList().size(); i++) {
+ SafetyTrainingService.fillDrillDisplay(page.getList().get(i), result.getList().get(i));
+ }
+ return success(result);
+ }
+
+ // ==================== 浜嬫晠 ====================
+
+ @PostMapping("/accident/create")
+ @Operation(summary = "鏂板浜嬫晠鐧昏")
+ @PreAuthorize("@ss.hasPermission('safety:accident:create')")
+ public CommonResult<Long> createAccident(@Valid @RequestBody SafetyAccidentSaveReqVO reqVO) {
+ return success(trainingService.createAccident(reqVO));
+ }
+
+ @PutMapping("/accident/update")
+ @Operation(summary = "淇敼浜嬫晠鐧昏")
+ @PreAuthorize("@ss.hasPermission('safety:accident:update')")
+ public CommonResult<Boolean> updateAccident(@Valid @RequestBody SafetyAccidentSaveReqVO reqVO) {
+ trainingService.updateAccident(reqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/accident/delete")
+ @Operation(summary = "鍒犻櫎浜嬫晠鐧昏")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:accident:delete')")
+ public CommonResult<Boolean> deleteAccident(@RequestParam("id") Long id) {
+ trainingService.deleteAccident(id);
+ return success(true);
+ }
+
+ @GetMapping("/accident/get")
+ @Operation(summary = "鑾峰緱浜嬫晠鐧昏")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:accident:query')")
+ public CommonResult<SafetyAccidentRespVO> getAccident(@RequestParam("id") Long id) {
+ var accident = trainingService.getAccident(id);
+ trainingService.fillAccidentRefs(java.util.List.of(accident));
+ var resp = BeanUtils.toBean(accident, SafetyAccidentRespVO.class);
+ SafetyTrainingService.fillAccidentDisplay(accident, resp);
+ return success(resp);
+ }
+
+ @GetMapping("/accident/page")
+ @Operation(summary = "鑾峰緱浜嬫晠鐧昏鍒嗛〉")
+ @PreAuthorize("@ss.hasPermission('safety:accident:query')")
+ public CommonResult<PageResult<SafetyAccidentRespVO>> accidentPage(
+ @Valid SafetyAccidentPageReqVO reqVO) {
+ var page = trainingService.getAccidentPage(reqVO);
+ trainingService.fillAccidentRefs(page.getList());
+ var result = BeanUtils.toBean(page, SafetyAccidentRespVO.class);
+ for (int i = 0; i < page.getList().size(); i++) {
+ SafetyTrainingService.fillAccidentDisplay(page.getList().get(i), result.getList().get(i));
+ }
+ return success(result);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyWorkPermitController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyWorkPermitController.java
new file mode 100644
index 0000000..3119ae0
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyWorkPermitController.java
@@ -0,0 +1,147 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.permit.*;
+import cn.iocoder.yudao.module.mes.service.safety.SafetyWorkPermitService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 瀹夊叏鐢熶骇 - 楂樺嵄浣滀笟绁紙鍔ㄧ伀 / 楂樺帇甯︾數 / 鏈夐檺绌洪棿绛夛級瀹℃壒涓庣數瀛愮暀瀛�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Tag(name = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-楂樺嵄浣滀笟绁�")
+@RestController
+@RequestMapping("/safety/permit")
+@Validated
+public class SafetyWorkPermitController {
+
+ @Resource
+ private SafetyWorkPermitService permitService;
+
+ @PostMapping("/create")
+ @Operation(summary = "鎻愪氦楂樺嵄浣滀笟鐢宠")
+ @PreAuthorize("@ss.hasPermission('safety:permit:create')")
+ public CommonResult<Long> create(@Valid @RequestBody SafetyWorkPermitSaveReqVO reqVO) {
+ return success(permitService.createPermit(reqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "淇敼浣滀笟绁�")
+ @PreAuthorize("@ss.hasPermission('safety:permit:update')")
+ public CommonResult<Boolean> update(@Valid @RequestBody SafetyWorkPermitSaveReqVO reqVO) {
+ permitService.updatePermit(reqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎浣滀笟绁紙杩炲悓鐩戞姢璁板綍锛�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:permit:delete')")
+ public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
+ permitService.deletePermit(id);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱浣滀笟绁�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:permit:query')")
+ public CommonResult<SafetyWorkPermitRespVO> get(@RequestParam("id") Long id) {
+ var permit = permitService.getPermit(id);
+ permitService.fillPermitRefs(java.util.List.of(permit));
+ var resp = BeanUtils.toBean(permit, SafetyWorkPermitRespVO.class);
+ SafetyWorkPermitService.fillPermitDisplay(permit, resp);
+ return success(resp);
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱浣滀笟绁ㄥ垎椤�")
+ @PreAuthorize("@ss.hasPermission('safety:permit:query')")
+ public CommonResult<PageResult<SafetyWorkPermitRespVO>> page(@Valid SafetyWorkPermitPageReqVO reqVO) {
+ var page = permitService.getPermitPage(reqVO);
+ permitService.fillPermitRefs(page.getList());
+ var result = BeanUtils.toBean(page, SafetyWorkPermitRespVO.class);
+ for (int i = 0; i < page.getList().size(); i++) {
+ SafetyWorkPermitService.fillPermitDisplay(page.getList().get(i), result.getList().get(i));
+ }
+ return success(result);
+ }
+
+ @PutMapping("/approve")
+ @Operation(summary = "瀹℃壒浣滀笟绁紙閫氳繃/椹冲洖锛�")
+ @PreAuthorize("@ss.hasPermission('safety:permit:approve')")
+ public CommonResult<Boolean> approve(@Valid @RequestBody SafetyWorkPermitApproveReqVO reqVO) {
+ permitService.approvePermit(reqVO);
+ return success(true);
+ }
+
+ @PutMapping("/start")
+ @Operation(summary = "寮�濮嬩綔涓�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:permit:update')")
+ public CommonResult<Boolean> start(@RequestParam("id") Long id) {
+ permitService.startPermit(id);
+ return success(true);
+ }
+
+ @PutMapping("/close")
+ @Operation(summary = "缁撴潫浣滀笟骞跺綊妗�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:permit:update')")
+ public CommonResult<Boolean> close(@RequestParam("id") Long id) {
+ permitService.closePermit(id);
+ return success(true);
+ }
+
+ @PutMapping("/cancel")
+ @Operation(summary = "浣滃簾浣滀笟绁�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:permit:update')")
+ public CommonResult<Boolean> cancel(@RequestParam("id") Long id) {
+ permitService.cancelPermit(id);
+ return success(true);
+ }
+
+ // ==================== 鐩戞姢璁板綍 ====================
+
+ @GetMapping("/monitor/list")
+ @Operation(summary = "鑾峰緱浣滀笟鐩戞姢璁板綍鍒楄〃")
+ @Parameter(name = "permitId", description = "浣滀笟绁ㄧ紪鍙�", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:permit:query')")
+ public CommonResult<List<SafetyWorkPermitMonitorRespVO>> monitorList(@RequestParam("permitId") Long permitId) {
+ var monitors = permitService.getMonitorList(permitId);
+ permitService.fillMonitorGuardians(monitors);
+ return success(BeanUtils.toBean(monitors, SafetyWorkPermitMonitorRespVO.class));
+ }
+
+ @PostMapping("/monitor/create")
+ @Operation(summary = "鏂板浣滀笟鐩戞姢璁板綍")
+ @PreAuthorize("@ss.hasPermission('safety:permit:update')")
+ public CommonResult<Long> createMonitor(@Valid @RequestBody SafetyWorkPermitMonitorSaveReqVO reqVO) {
+ return success(permitService.createMonitor(reqVO));
+ }
+
+ @DeleteMapping("/monitor/delete")
+ @Operation(summary = "鍒犻櫎浣滀笟鐩戞姢璁板綍")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:permit:update')")
+ public CommonResult<Boolean> deleteMonitor(@RequestParam("id") Long id) {
+ permitService.deleteMonitor(id);
+ return success(true);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificatePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificatePageReqVO.java
new file mode 100644
index 0000000..6281635
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificatePageReqVO.java
@@ -0,0 +1,50 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗圭浣滀笟璇佸垎椤� Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鐗圭浣滀笟璇佸垎椤� Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyCertificatePageReqVO extends PageParam {
+
+ @Schema(description = "鎸佽瘉浜猴紙鍛樺伐缂栧彿锛�")
+ private Long employeeId;
+
+ @Schema(description = "鎸佽瘉浜哄鍚嶏紙妯$硦鍖归厤锛�")
+ private String employeeName;
+
+ @Schema(description = "宸ュ彿")
+ private String employeeNo;
+
+ @Schema(description = "鎵�灞為儴闂�")
+ private String deptName;
+
+ @Schema(description = "璇佷欢绫诲瀷")
+ private String certType;
+
+ @Schema(description = "璇佷欢缂栧彿")
+ private String certNo;
+
+ @Schema(description = "鐘舵��")
+ private String status;
+
+ @Schema(description = "鏈夋晥鏈熷紑濮�")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate expireDateStart;
+
+ @Schema(description = "鏈夋晥鏈熸埅姝�")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate expireDateEnd;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateRespVO.java
new file mode 100644
index 0000000..5f3d8f8
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateRespVO.java
@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗圭浣滀笟璇� Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鐗圭浣滀笟璇� Response VO")
+@Data
+public class SafetyCertificateRespVO {
+
+ private Long id;
+ @Schema(description = "鎸佽瘉浜猴紙鍛樺伐缂栧彿锛�")
+ private Long employeeId;
+ @Schema(description = "鎸佽瘉浜哄叧鑱旂殑绯荤粺鐢ㄦ埛缂栧彿")
+ private Long userId;
+ private String employeeName;
+ private String employeeNo;
+ private String deptName;
+ private String phone;
+ private String certType;
+ @Schema(description = "璇佷欢绫诲瀷鍚嶇О")
+ private String certTypeName;
+ private String certNo;
+ private String issuer;
+ private LocalDate issueDate;
+ private LocalDate expireDate;
+ private LocalDate reviewDate;
+ private Integer warnDays;
+ private String status;
+ @Schema(description = "鐘舵�佸悕绉�")
+ private String statusName;
+ @Schema(description = "璺濆埌鏈熷ぉ鏁帮紝璐熸暟琛ㄧず宸茶繃鏈�")
+ private Long remainingDays;
+ private String attachment;
+ private String remark;
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateSaveReqVO.java
new file mode 100644
index 0000000..b6881a7
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateSaveReqVO.java
@@ -0,0 +1,73 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗圭浣滀笟璇佹柊澧�/淇敼 Request VO
+ *
+ * <p>鎸佽瘉浜洪�氳繃 employeeId 鍏宠仈鍛樺伐妗f锛屽鍚嶄笌閮ㄩ棬鐢卞悗绔粠妗f甯﹀嚭锛�
+ * 鍓嶇鍙渶閫変汉锛屼笉鎵嬪伐濉啓锛岄伩鍏嶄笌浜哄姏璧勬簮鏁版嵁涓嶄竴鑷淬��</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鐗圭浣滀笟璇佹柊澧�/淇敼 Request VO")
+@Data
+public class SafetyCertificateSaveReqVO {
+
+ private Long id;
+
+ @Schema(description = "鎸佽瘉浜猴紙鍛樺伐缂栧彿锛�", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "璇烽�夋嫨鎸佽瘉浜�")
+ private Long employeeId;
+
+ @Schema(description = "璇佷欢绫诲瀷", requiredMode = Schema.RequiredMode.REQUIRED, example = "HIGH_VOLTAGE_OPERATION")
+ @NotBlank(message = "璇佷欢绫诲瀷涓嶈兘涓虹┖")
+ @Pattern(regexp = "LOW_VOLTAGE_ELECTRICIAN|HIGH_VOLTAGE_OPERATION|WELDING|HOIST|HEIGHT_WORK|LIMITED_SPACE|FORKLIFT|BOILER|OTHER",
+ message = "璇佷欢绫诲瀷涓嶅悎娉�")
+ private String certType;
+
+ @Schema(description = "璇佷欢缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "T330102199001011234")
+ @NotBlank(message = "璇佷欢缂栧彿涓嶈兘涓虹┖")
+ @Size(max = 64)
+ private String certNo;
+
+ @Schema(description = "鍙戣瘉鏈哄叧")
+ @Size(max = 100)
+ private String issuer;
+
+ @Schema(description = "鍙戣瘉鏃ユ湡")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate issueDate;
+
+ @Schema(description = "鏈夋晥鏈熻嚦", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "鏈夋晥鏈熶笉鑳戒负绌�")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate expireDate;
+
+ @Schema(description = "涓嬫澶嶅鏃ユ湡")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate reviewDate;
+
+ @Schema(description = "鍒版湡棰勮鎻愬墠澶╂暟", example = "30")
+ @Min(value = 0, message = "棰勮澶╂暟涓嶈兘涓鸿礋鏁�")
+ @Max(value = 365, message = "棰勮澶╂暟涓嶈兘瓒呰繃 365 澶�")
+ private Integer warnDays;
+
+ @Schema(description = "鐘舵��", example = "VALID")
+ @Pattern(regexp = "VALID|EXPIRING|EXPIRED|REVOKED", message = "鐘舵�佷笉鍚堟硶")
+ private String status;
+
+ @Schema(description = "璇佷欢鎵弿浠� URL锛岄�楀彿鍒嗛殧")
+ @Size(max = 500)
+ private String attachment;
+
+ @Schema(description = "澶囨敞")
+ @Size(max = 500)
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardAssignReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardAssignReqVO.java
new file mode 100644
index 0000000..f763d0f
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardAssignReqVO.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅鍒嗘淳 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 闅愭偅鍒嗘淳 Request VO")
+@Data
+public class SafetyHazardAssignReqVO {
+
+ @Schema(description = "闅愭偅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "闅愭偅缂栧彿涓嶈兘涓虹┖")
+ private Long id;
+
+ @Schema(description = "鏁存敼璐d换浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璇烽�夋嫨鏁存敼璐d换浜�")
+ private Long assigneeId;
+
+ @Schema(description = "鏁存敼鏈熼檺")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate rectifyDeadline;
+
+ @Schema(description = "鍒嗘淳璇存槑")
+ @Size(max = 500)
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardPageReqVO.java
new file mode 100644
index 0000000..e6da28e
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardPageReqVO.java
@@ -0,0 +1,48 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅鍒嗛〉 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 闅愭偅鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyHazardPageReqVO extends PageParam {
+
+ private String code;
+ private String title;
+ private String level;
+ private String source;
+ private String status;
+ private String assignee;
+ private String location;
+
+ @Schema(description = "涓婃姤鏃堕棿鑼冨洿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime[] reportTime;
+
+ @Schema(description = "涓婃姤鏃堕棿寮�濮嬶紙鍐呴儴浣跨敤锛�", hidden = true)
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+ private LocalDateTime reportTimeStart;
+
+ @Schema(description = "涓婃姤鏃堕棿缁撴潫锛堝唴閮ㄤ娇鐢級", hidden = true)
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+ private LocalDateTime reportTimeEnd;
+
+ public void normalizeTimeRange() {
+ if (reportTime != null && reportTime.length == 2) {
+ this.reportTimeStart = reportTime[0];
+ this.reportTimeEnd = reportTime[1];
+ }
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRecheckReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRecheckReqVO.java
new file mode 100644
index 0000000..0230fb6
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRecheckReqVO.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅澶嶆煡 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 闅愭偅澶嶆煡 Request VO")
+@Data
+public class SafetyHazardRecheckReqVO {
+
+ @Schema(description = "闅愭偅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "闅愭偅缂栧彿涓嶈兘涓虹┖")
+ private Long id;
+
+ @Schema(description = "澶嶆煡浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璇烽�夋嫨澶嶆煡浜�")
+ private Long recheckerId;
+
+ @Schema(description = "澶嶆煡缁撹锛歅ASSED-閫氳繃锛孯EJECTED-涓嶉�氳繃", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotBlank(message = "澶嶆煡缁撹涓嶈兘涓虹┖")
+ @Pattern(regexp = "PASSED|REJECTED", message = "澶嶆煡缁撹鍙兘涓洪�氳繃鎴栦笉閫氳繃")
+ private String recheckResult;
+
+ @Schema(description = "澶嶆煡鎰忚")
+ @Size(max = 500)
+ private String recheckRemark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRectifyReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRectifyReqVO.java
new file mode 100644
index 0000000..d1eb19d
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRectifyReqVO.java
@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅鏁存敼 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 闅愭偅鏁存敼 Request VO")
+@Data
+public class SafetyHazardRectifyReqVO {
+
+ @Schema(description = "闅愭偅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "闅愭偅缂栧彿涓嶈兘涓虹┖")
+ private Long id;
+
+ @Schema(description = "鏁存敼鎺柦涓庣粨鏋�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotBlank(message = "鏁存敼鎺柦涓庣粨鏋滀笉鑳戒负绌�")
+ @Size(max = 2000)
+ private String rectifyDesc;
+
+ @Schema(description = "鏁存敼鍚庣収鐗� URL锛岄�楀彿鍒嗛殧")
+ @Size(max = 2000)
+ private String rectifyPhotoUrls;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRespVO.java
new file mode 100644
index 0000000..4ae9ea9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRespVO.java
@@ -0,0 +1,62 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅 Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 闅愭偅 Response VO")
+@Data
+public class SafetyHazardRespVO {
+
+ private Long id;
+ private String code;
+ private String title;
+ private String level;
+ @Schema(description = "闅愭偅绛夌骇鍚嶇О")
+ private String levelName;
+ private String source;
+ @Schema(description = "鏉ユ簮鍚嶇О")
+ private String sourceName;
+ private Long inspectionId;
+ private Long pointId;
+ private String pointName;
+ private String location;
+ private String description;
+ private String photoUrls;
+ @Schema(description = "涓婃姤浜虹紪鍙�")
+ private Long reporterId;
+ private String reporter;
+ private LocalDateTime reportTime;
+ @Schema(description = "鏁存敼璐d换浜虹紪鍙�")
+ private Long assigneeId;
+ private String assignee;
+ private LocalDateTime assignTime;
+ private LocalDate rectifyDeadline;
+ @Schema(description = "鏄惁宸茶秴鏈�")
+ private Boolean overdue;
+ private String rectifyDesc;
+ private String rectifyPhotoUrls;
+ private LocalDateTime rectifyTime;
+ @Schema(description = "澶嶆煡浜虹紪鍙�")
+ private Long recheckerId;
+ private String rechecker;
+ private LocalDateTime recheckTime;
+ private String recheckResult;
+ @Schema(description = "澶嶆煡缁撹鍚嶇О")
+ private String recheckResultName;
+ private String recheckRemark;
+ private String status;
+ @Schema(description = "鐘舵�佸悕绉�")
+ private String statusName;
+ private LocalDateTime closeTime;
+ private String remark;
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardSaveReqVO.java
new file mode 100644
index 0000000..ecd21ec
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardSaveReqVO.java
@@ -0,0 +1,73 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅涓婃姤/淇敼 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 闅愭偅涓婃姤/淇敼 Request VO")
+@Data
+public class SafetyHazardSaveReqVO {
+
+ private Long id;
+
+ @Schema(description = "闅愭偅鏍囬", requiredMode = Schema.RequiredMode.REQUIRED, example = "閰嶇數瀹ら棬鏈笂閿�")
+ @NotBlank(message = "闅愭偅鏍囬涓嶈兘涓虹┖")
+ @Size(max = 200)
+ private String title;
+
+ @Schema(description = "闅愭偅绛夌骇", example = "GENERAL")
+ @Pattern(regexp = "GENERAL|MAJOR", message = "闅愭偅绛夌骇涓嶅悎娉�")
+ private String level;
+
+ @Schema(description = "鏉ユ簮", example = "INSPECTION")
+ @Pattern(regexp = "INSPECTION|SELF_CHECK|REPORT|EXTERNAL", message = "闅愭偅鏉ユ簮涓嶅悎娉�")
+ private String source;
+
+ @Schema(description = "鍏宠仈宸℃璁板綍缂栧彿")
+ private Long inspectionId;
+
+ @Schema(description = "鍏宠仈宸℃鐐逛綅缂栧彿")
+ private Long pointId;
+
+ @Schema(description = "鐐逛綅鍚嶇О")
+ @Size(max = 100)
+ private String pointName;
+
+ @Schema(description = "闅愭偅浣嶇疆")
+ @Size(max = 200)
+ private String location;
+
+ @Schema(description = "闅愭偅鎻忚堪")
+ @Size(max = 2000)
+ private String description;
+
+ @Schema(description = "鐜板満鐓х墖 URL锛岄�楀彿鍒嗛殧锛堢Щ鍔ㄧ鎷嶇収涓婁紶锛�")
+ @Size(max = 2000)
+ private String photoUrls;
+
+ @Schema(description = "涓婃姤浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璇烽�夋嫨涓婃姤浜�")
+ private Long reporterId;
+
+ @Schema(description = "涓婃姤鏃堕棿")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+ private LocalDateTime reportTime;
+
+ @Schema(description = "鏁存敼鏈熼檺")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate rectifyDeadline;
+
+ @Schema(description = "澶囨敞")
+ @Size(max = 500)
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPageReqVO.java
new file mode 100644
index 0000000..ef565c5
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPageReqVO.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.inspection;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃璁板綍鍒嗛〉 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 宸℃璁板綍鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyInspectionPageReqVO extends PageParam {
+
+ private Long pointId;
+ private String pointType;
+ private String inspector;
+ private String result;
+
+ @Schema(description = "宸℃鏃堕棿鑼冨洿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime[] inspectTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointPageReqVO.java
new file mode 100644
index 0000000..b4d3097
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointPageReqVO.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.inspection;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃鐐逛綅鍒嗛〉 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 宸℃鐐逛綅鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyInspectionPointPageReqVO extends PageParam {
+
+ private String code;
+ private String name;
+ private String pointType;
+ private String workshopName;
+ private Integer status;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointRespVO.java
new file mode 100644
index 0000000..81926e9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointRespVO.java
@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.inspection;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃鐐逛綅 Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 宸℃鐐逛綅 Response VO")
+@Data
+public class SafetyInspectionPointRespVO {
+
+ private Long id;
+ private String code;
+ private String name;
+ private String pointType;
+ @Schema(description = "鐐逛綅绫诲瀷鍚嶇О")
+ private String pointTypeName;
+ @Schema(description = "鎵�灞炶溅闂寸紪鍙�")
+ private Long workshopId;
+ private String workshopName;
+ private String location;
+ private String inspectItems;
+ private String inspectCycle;
+ @Schema(description = "宸℃鍛ㄦ湡鍚嶇О")
+ private String inspectCycleName;
+ @Schema(description = "璐d换浜虹紪鍙�")
+ private Long ownerId;
+ private String ownerName;
+ private Integer status;
+ @Schema(description = "鏈�杩戜竴娆″贰妫�鏃堕棿")
+ private LocalDateTime lastInspectTime;
+ private String remark;
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointSaveReqVO.java
new file mode 100644
index 0000000..0d86357
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointSaveReqVO.java
@@ -0,0 +1,59 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.inspection;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃鐐逛綅鏂板/淇敼 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 宸℃鐐逛綅鏂板/淇敼 Request VO")
+@Data
+public class SafetyInspectionPointSaveReqVO {
+
+ private Long id;
+
+ @Schema(description = "鐐逛綅缂栫爜", requiredMode = Schema.RequiredMode.REQUIRED, example = "PD-001")
+ @NotBlank(message = "鐐逛綅缂栫爜涓嶈兘涓虹┖")
+ @Size(max = 64)
+ private String code;
+
+ @Schema(description = "鐐逛綅鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "1#楂樺帇閰嶇數瀹�")
+ @NotBlank(message = "鐐逛綅鍚嶇О涓嶈兘涓虹┖")
+ @Size(max = 100)
+ private String name;
+
+ @Schema(description = "鐐逛綅绫诲瀷", requiredMode = Schema.RequiredMode.REQUIRED, example = "HIGH_VOLTAGE_ROOM")
+ @NotBlank(message = "鐐逛綅绫诲瀷涓嶈兘涓虹┖")
+ @Pattern(regexp = "HIGH_VOLTAGE_ROOM|UNIT_AREA|DANGER_CHEMICAL|FIRE_AREA|WORKSHOP|OTHER", message = "鐐逛綅绫诲瀷涓嶅悎娉�")
+ private String pointType;
+
+ @Schema(description = "鎵�灞炶溅闂达紙鍏宠仈 mes_md_workshop锛�")
+ private Long workshopId;
+
+ @Schema(description = "鍏蜂綋浣嶇疆")
+ @Size(max = 200)
+ private String location;
+
+ @Schema(description = "宸℃椤圭洰娓呭崟锛屾寜琛屽垎闅�")
+ @Size(max = 2000)
+ private String inspectItems;
+
+ @Schema(description = "宸℃鍛ㄦ湡", example = "DAILY")
+ @Pattern(regexp = "SHIFT|DAILY|WEEKLY|MONTHLY", message = "宸℃鍛ㄦ湡涓嶅悎娉�")
+ private String inspectCycle;
+
+ @Schema(description = "璐d换浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�")
+ private Long ownerId;
+
+ @Schema(description = "鐘舵�侊細0-鍚敤锛�1-鍋滅敤", example = "0")
+ @NotNull(message = "鐘舵�佷笉鑳戒负绌�")
+ private Integer status;
+
+ @Schema(description = "澶囨敞")
+ @Size(max = 500)
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionRespVO.java
new file mode 100644
index 0000000..f3d93ad
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionRespVO.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.inspection;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃璁板綍 Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 宸℃璁板綍 Response VO")
+@Data
+public class SafetyInspectionRespVO {
+
+ private Long id;
+ private Long pointId;
+ private String pointName;
+ private String pointType;
+ @Schema(description = "鐐逛綅绫诲瀷鍚嶇О")
+ private String pointTypeName;
+ private LocalDateTime inspectTime;
+ @Schema(description = "宸℃浜虹紪鍙�")
+ private Long inspectorId;
+ private String inspector;
+ private String result;
+ @Schema(description = "宸℃缁撴灉鍚嶇О")
+ private String resultName;
+ private String content;
+ private String photoUrls;
+ private Integer hazardCount;
+ private String remark;
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionSaveReqVO.java
new file mode 100644
index 0000000..df34455
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionSaveReqVO.java
@@ -0,0 +1,54 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.inspection;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃璁板綍鏂板/淇敼 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 宸℃璁板綍鏂板/淇敼 Request VO")
+@Data
+public class SafetyInspectionSaveReqVO {
+
+ private Long id;
+
+ @Schema(description = "宸℃鐐逛綅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "宸℃鐐逛綅涓嶈兘涓虹┖")
+ private Long pointId;
+
+ @Schema(description = "宸℃鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "宸℃鏃堕棿涓嶈兘涓虹┖")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+ private LocalDateTime inspectTime;
+
+ @Schema(description = "宸℃浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璇烽�夋嫨宸℃浜�")
+ private Long inspectorId;
+
+ @Schema(description = "宸℃缁撴灉", example = "NORMAL")
+ @Pattern(regexp = "NORMAL|ABNORMAL", message = "宸℃缁撴灉鍙兘涓烘甯告垨寮傚父")
+ private String result;
+
+ @Schema(description = "宸℃鍐呭涓庢儏鍐�")
+ @Size(max = 2000)
+ private String content;
+
+ @Schema(description = "鐜板満鐓х墖 URL锛岄�楀彿鍒嗛殧")
+ @Size(max = 2000)
+ private String photoUrls;
+
+ @Schema(description = "鏈鍙戠幇鐨勯殣鎮f暟", example = "0")
+ @Min(value = 0, message = "闅愭偅鏁颁笉鑳戒负璐熸暟")
+ private Integer hazardCount;
+
+ @Schema(description = "澶囨敞")
+ @Size(max = 500)
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ledger/SafetyLedgerExportReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ledger/SafetyLedgerExportReqVO.java
new file mode 100644
index 0000000..5768372
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ledger/SafetyLedgerExportReqVO.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ledger;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Pattern;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鏍囧噯鍖栧彴璐﹀鍑� Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鏍囧噯鍖栧彴璐﹀鍑� Request VO")
+@Data
+public class SafetyLedgerExportReqVO {
+
+ @Schema(description = "鍙拌处绫诲瀷锛欰LL-鍏ㄥ锛孋ERT-鐗圭浣滀笟璇侊紝HAZARD-闅愭偅锛孭ERMIT-浣滀笟绁紝MATERIAL-鐗╄祫锛孴RAINING-鍩硅锛孌RILL-婕旂粌锛孉CCIDENT-浜嬫晠锛孖NSPECTION-宸℃",
+ example = "ALL")
+ @Pattern(regexp = "ALL|CERT|HAZARD|PERMIT|MATERIAL|TRAINING|DRILL|ACCIDENT|INSPECTION", message = "鍙拌处绫诲瀷涓嶅悎娉�")
+ private String type;
+
+ @Schema(description = "寮�濮嬫棩鏈�")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate startDate;
+
+ @Schema(description = "缁撴潫鏃ユ湡")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate endDate;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ledger/SafetyOverviewRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ledger/SafetyOverviewRespVO.java
new file mode 100644
index 0000000..3538659
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ledger/SafetyOverviewRespVO.java
@@ -0,0 +1,62 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ledger;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鎬昏缁熻 Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇鎬昏缁熻 Response VO")
+@Data
+public class SafetyOverviewRespVO {
+
+ @Schema(description = "鐗圭浣滀笟璇佹�绘暟")
+ private Long certTotal;
+ @Schema(description = "鍗冲皢鍒版湡璇佷欢鏁�")
+ private Long certExpiring;
+ @Schema(description = "宸茶繃鏈熻瘉浠舵暟")
+ private Long certExpired;
+ @Schema(description = "闅愭偅鎬绘暟")
+ private Long hazardTotal;
+ @Schema(description = "鏈棴鐜殣鎮f暟")
+ private Long hazardOpen;
+ @Schema(description = "宸茶秴鏈熸湭闂幆闅愭偅鏁�")
+ private Long hazardOverdue;
+ @Schema(description = "闅愭偅闂幆鐜囷紙0-100锛�")
+ private Integer hazardCloseRate;
+ @Schema(description = "寰呭鎵逛綔涓氱エ鏁�")
+ private Long permitPending;
+ @Schema(description = "杩涜涓綔涓氱エ鏁�")
+ private Long permitInProgress;
+ @Schema(description = "鐗╄祫浣庝簬瀹夊叏搴撳瓨鏁�")
+ private Long materialBelowSafeStock;
+ @Schema(description = "鐗╄祫涓磋繎鏈夋晥鏈熸暟")
+ private Long materialExpiring;
+ @Schema(description = "鏈湀鍩硅鍦烘")
+ private Long trainingThisMonth;
+ @Schema(description = "鏈湀婕旂粌鍦烘")
+ private Long drillThisMonth;
+ @Schema(description = "鏈湀浜嬫晠鏁�")
+ private Long accidentThisMonth;
+
+ @Schema(description = "闅愭偅瓒嬪娍锛堣繎 6 涓湀锛屾寜鏈堬級")
+ private List<MonthlyCount> hazardTrend;
+ @Schema(description = "浜嬫晠瓒嬪娍锛堣繎 6 涓湀锛屾寜鏈堬級")
+ private List<MonthlyCount> accidentTrend;
+
+ /**
+ * 鎸夋湀璁℃暟
+ */
+ @Data
+ public static class MonthlyCount {
+ @Schema(description = "鏈堜唤锛屾牸寮� yyyy-MM", example = "2026-10")
+ private String month;
+ @Schema(description = "鏁伴噺")
+ private Long count;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialPageReqVO.java
new file mode 100644
index 0000000..61ab520
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialPageReqVO.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.material;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗╄祫鍙拌处鍒嗛〉 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鐗╄祫鍙拌处鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyMaterialPageReqVO extends PageParam {
+
+ private String code;
+ private String name;
+ private String category;
+ private String storageLocation;
+ private Integer status;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialRespVO.java
new file mode 100644
index 0000000..fef6976
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialRespVO.java
@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.material;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗╄祫鍙拌处 Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鐗╄祫鍙拌处 Response VO")
+@Data
+public class SafetyMaterialRespVO {
+
+ private Long id;
+ private String code;
+ private String name;
+ private String category;
+ @Schema(description = "绫诲埆鍚嶇О")
+ private String categoryName;
+ private String spec;
+ private String unit;
+ private BigDecimal stockQty;
+ private BigDecimal safeStock;
+ @Schema(description = "鏄惁浣庝簬瀹夊叏搴撳瓨")
+ private Boolean belowSafeStock;
+ private String storageLocation;
+ private LocalDate expireDate;
+ @Schema(description = "璺濇湁鏁堟湡澶╂暟锛岃礋鏁拌〃绀哄凡杩囨湡")
+ private Long expireRemainingDays;
+ private Integer validityMonths;
+ @Schema(description = "淇濈浜虹紪鍙�")
+ private Long managerId;
+ private String manager;
+ private Integer status;
+ private String remark;
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialSaveReqVO.java
new file mode 100644
index 0000000..f9d112f
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialSaveReqVO.java
@@ -0,0 +1,76 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.material;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗╄祫鍙拌处鏂板/淇敼 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鐗╄祫鍙拌处鏂板/淇敼 Request VO")
+@Data
+public class SafetyMaterialSaveReqVO {
+
+ private Long id;
+
+ @Schema(description = "鐗╄祫缂栫爜", requiredMode = Schema.RequiredMode.REQUIRED, example = "PM-001")
+ @NotBlank(message = "鐗╄祫缂栫爜涓嶈兘涓虹┖")
+ @Size(max = 64)
+ private String code;
+
+ @Schema(description = "鐗╄祫鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "10kV 缁濈紭鎵嬪")
+ @NotBlank(message = "鐗╄祫鍚嶇О涓嶈兘涓虹┖")
+ @Size(max = 100)
+ private String name;
+
+ @Schema(description = "绫诲埆", requiredMode = Schema.RequiredMode.REQUIRED, example = "INSULATING")
+ @NotBlank(message = "鐗╄祫绫诲埆涓嶈兘涓虹┖")
+ @Pattern(regexp = "INSULATING|HAZARD_CHEMICAL|FIRE|PPE|OTHER", message = "鐗╄祫绫诲埆涓嶅悎娉�")
+ private String category;
+
+ @Schema(description = "瑙勬牸鍨嬪彿")
+ @Size(max = 100)
+ private String spec;
+
+ @Schema(description = "璁¢噺鍗曚綅", example = "鍙�")
+ @Size(max = 20)
+ private String unit;
+
+ @Schema(description = "褰撳墠搴撳瓨鏁伴噺")
+ @DecimalMin(value = "0", message = "搴撳瓨鏁伴噺涓嶈兘涓鸿礋鏁�")
+ private BigDecimal stockQty;
+
+ @Schema(description = "瀹夊叏搴撳瓨")
+ @DecimalMin(value = "0", message = "瀹夊叏搴撳瓨涓嶈兘涓鸿礋鏁�")
+ private BigDecimal safeStock;
+
+ @Schema(description = "瀛樻斁浣嶇疆")
+ @Size(max = 100)
+ private String storageLocation;
+
+ @Schema(description = "鏈夋晥鏈熻嚦")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate expireDate;
+
+ @Schema(description = "鏈夋晥鏈熸湀鏁�")
+ @Min(value = 0, message = "鏈夋晥鏈熸湀鏁颁笉鑳戒负璐熸暟")
+ private Integer validityMonths;
+
+ @Schema(description = "淇濈浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�")
+ private Long managerId;
+
+ @Schema(description = "鐘舵�侊細0-鍚敤锛�1-鍋滅敤", example = "0")
+ @NotNull(message = "鐘舵�佷笉鑳戒负绌�")
+ private Integer status;
+
+ @Schema(description = "澶囨敞")
+ @Size(max = 500)
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialStockPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialStockPageReqVO.java
new file mode 100644
index 0000000..df65b79
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialStockPageReqVO.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.material;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗╄祫鍑哄叆搴撴祦姘村垎椤� Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鐗╄祫鍑哄叆搴撴祦姘村垎椤� Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyMaterialStockPageReqVO extends PageParam {
+
+ private Long materialId;
+ private String materialName;
+ private String category;
+ private String bizType;
+
+ @Schema(description = "涓氬姟鏃ユ湡鑼冨洿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate[] bizDate;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialStockRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialStockRespVO.java
new file mode 100644
index 0000000..9e2fd5c
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialStockRespVO.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.material;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗╄祫鍑哄叆搴撴祦姘� Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鐗╄祫鍑哄叆搴撴祦姘� Response VO")
+@Data
+public class SafetyMaterialStockRespVO {
+
+ private Long id;
+ private Long materialId;
+ private String materialName;
+ private String category;
+ @Schema(description = "绫诲埆鍚嶇О")
+ private String categoryName;
+ private String bizType;
+ @Schema(description = "涓氬姟绫诲瀷鍚嶇О")
+ private String bizTypeName;
+ private BigDecimal quantity;
+ private BigDecimal stockBefore;
+ private BigDecimal stockAfter;
+ private LocalDate bizDate;
+ private String operator;
+ private String receiver;
+ private String purpose;
+ private String remark;
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialStockSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialStockSaveReqVO.java
new file mode 100644
index 0000000..e045108
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialStockSaveReqVO.java
@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.material;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗╄祫鍑哄叆搴撶櫥璁� Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鐗╄祫鍑哄叆搴撶櫥璁� Request VO")
+@Data
+public class SafetyMaterialStockSaveReqVO {
+
+ @Schema(description = "鐗╄祫缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "鐗╄祫涓嶈兘涓虹┖")
+ private Long materialId;
+
+ @Schema(description = "涓氬姟绫诲瀷锛欼N-鍏ュ簱锛孫UT-鍑哄簱", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotBlank(message = "涓氬姟绫诲瀷涓嶈兘涓虹┖")
+ @Pattern(regexp = "IN|OUT", message = "涓氬姟绫诲瀷鍙兘涓哄叆搴撴垨鍑哄簱")
+ private String bizType;
+
+ @Schema(description = "鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+ @NotNull(message = "鏁伴噺涓嶈兘涓虹┖")
+ @DecimalMin(value = "0", inclusive = false, message = "鏁伴噺蹇呴』澶т簬闆�")
+ @Digits(integer = 15, fraction = 3)
+ private BigDecimal quantity;
+
+ @Schema(description = "涓氬姟鏃ユ湡")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate bizDate;
+
+ @Schema(description = "缁忓姙浜�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotBlank(message = "缁忓姙浜轰笉鑳戒负绌�")
+ @Size(max = 50)
+ private String operator;
+
+ @Schema(description = "棰嗙敤浜猴紙鍑哄簱濉啓锛�")
+ @Size(max = 50)
+ private String receiver;
+
+ @Schema(description = "鐢ㄩ��/鍘诲悜")
+ @Size(max = 200)
+ private String purpose;
+
+ @Schema(description = "澶囨敞")
+ @Size(max = 500)
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgRespVO.java
new file mode 100644
index 0000000..cc587cd
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgRespVO.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.org;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 瀹夊叏缁勭粐 Response VO锛堟爲褰級
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 瀹夊叏缁勭粐 Response VO")
+@Data
+public class SafetyOrgRespVO {
+
+ private Long id;
+ private Long parentId;
+ private String name;
+ @Schema(description = "璐熻矗浜猴紙鍛樺伐缂栧彿锛�")
+ private Long leaderId;
+ @Schema(description = "璐熻矗浜哄鍚嶏紙蹇収锛�")
+ private String leaderName;
+ private String leaderPhone;
+ private String memberNames;
+ private String duty;
+ private Integer sort;
+ private Integer status;
+ private String remark;
+ private LocalDateTime createTime;
+
+ @Schema(description = "瀛愮粍缁�")
+ private List<SafetyOrgRespVO> children;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgSaveReqVO.java
new file mode 100644
index 0000000..6694c0a
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgSaveReqVO.java
@@ -0,0 +1,51 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.org;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+/**
+ * 瀹夊叏鐢熶骇 - 瀹夊叏缁勭粐鏂板/淇敼 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 瀹夊叏缁勭粐鏂板/淇敼 Request VO")
+@Data
+public class SafetyOrgSaveReqVO {
+
+ private Long id;
+
+ @Schema(description = "鐖剁骇缂栧彿锛�0 涓洪《绾�", example = "0")
+ private Long parentId;
+
+ @Schema(description = "缁勭粐鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "瀹夊叏鐢熶骇濮斿憳浼�")
+ @NotBlank(message = "缁勭粐鍚嶇О涓嶈兘涓虹┖")
+ @Size(max = 100, message = "缁勭粐鍚嶇О闀垮害涓嶈兘瓒呰繃 100 瀛�")
+ private String name;
+
+ @Schema(description = "璐熻矗浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�")
+ private Long leaderId;
+
+ @Schema(description = "鎴愬憳濮撳悕锛岄�楀彿鍒嗛殧")
+ @Size(max = 500)
+ private String memberNames;
+
+ @Schema(description = "瀹夊叏鑱岃矗")
+ @Size(max = 500)
+ private String duty;
+
+ @Schema(description = "鏄剧ず椤哄簭", example = "1")
+ @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
+ private Integer sort;
+
+ @Schema(description = "鐘舵�侊細0-鍚敤锛�1-鍋滅敤", example = "0")
+ @NotNull(message = "鐘舵�佷笉鑳戒负绌�")
+ private Integer status;
+
+ @Schema(description = "澶囨敞")
+ @Size(max = 500)
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitApproveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitApproveReqVO.java
new file mode 100644
index 0000000..bca98c7
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitApproveReqVO.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.permit;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+/**
+ * 瀹夊叏鐢熶骇 - 楂樺嵄浣滀笟绁ㄥ鎵� Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 楂樺嵄浣滀笟绁ㄥ鎵� Request VO")
+@Data
+public class SafetyWorkPermitApproveReqVO {
+
+ @Schema(description = "浣滀笟绁ㄧ紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "浣滀笟绁ㄧ紪鍙蜂笉鑳戒负绌�")
+ private Long id;
+
+ @Schema(description = "瀹℃壒浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璇烽�夋嫨瀹℃壒浜�")
+ private Long approverId;
+
+ @Schema(description = "瀹℃壒缁撹锛欰PPROVED-閫氳繃锛孯EJECTED-椹冲洖", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotBlank(message = "瀹℃壒缁撹涓嶈兘涓虹┖")
+ @Pattern(regexp = "APPROVED|REJECTED", message = "瀹℃壒缁撹鍙兘涓洪�氳繃鎴栭┏鍥�")
+ private String decision;
+
+ @Schema(description = "瀹℃壒鎰忚")
+ @Size(max = 500)
+ private String approveComment;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorRespVO.java
new file mode 100644
index 0000000..a279ef9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorRespVO.java
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.permit;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 浣滀笟鐩戞姢璁板綍 Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 浣滀笟鐩戞姢璁板綍 Response VO")
+@Data
+public class SafetyWorkPermitMonitorRespVO {
+
+ private Long id;
+ private Long permitId;
+ private LocalDateTime monitorTime;
+ @Schema(description = "鐩戞姢浜虹紪鍙�")
+ private Long guardianId;
+ private String guardian;
+ private String monitorContent;
+ private String abnormal;
+ private String photoUrls;
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorSaveReqVO.java
new file mode 100644
index 0000000..697f70d
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorSaveReqVO.java
@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.permit;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 浣滀笟鐩戞姢璁板綍鏂板 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 浣滀笟鐩戞姢璁板綍鏂板 Request VO")
+@Data
+public class SafetyWorkPermitMonitorSaveReqVO {
+
+ private Long id;
+
+ @Schema(description = "浣滀笟绁ㄧ紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "浣滀笟绁ㄧ紪鍙蜂笉鑳戒负绌�")
+ private Long permitId;
+
+ @Schema(description = "鐩戞姢鏃堕棿")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+ private LocalDateTime monitorTime;
+
+ @Schema(description = "鐩戞姢浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璇烽�夋嫨鐩戞姢浜�")
+ private Long guardianId;
+
+ @Schema(description = "鐩戞姢鍐呭涓庢儏鍐�")
+ @Size(max = 1000)
+ private String monitorContent;
+
+ @Schema(description = "寮傚父鎯呭喌涓庡缃�")
+ @Size(max = 500)
+ private String abnormal;
+
+ @Schema(description = "鐜板満鐓х墖 URL锛岄�楀彿鍒嗛殧")
+ @Size(max = 2000)
+ private String photoUrls;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitPageReqVO.java
new file mode 100644
index 0000000..dc92c21
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitPageReqVO.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.permit;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 楂樺嵄浣滀笟绁ㄥ垎椤� Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 楂樺嵄浣滀笟绁ㄥ垎椤� Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyWorkPermitPageReqVO extends PageParam {
+
+ private String code;
+ private String title;
+ private String permitType;
+ private String status;
+ private String riskLevel;
+ private String applicant;
+ private String workshopName;
+
+ @Schema(description = "璁″垝寮�濮嬫椂闂磋寖鍥�")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime[] planStartTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitRespVO.java
new file mode 100644
index 0000000..c01439f
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitRespVO.java
@@ -0,0 +1,58 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.permit;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 楂樺嵄浣滀笟绁� Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 楂樺嵄浣滀笟绁� Response VO")
+@Data
+public class SafetyWorkPermitRespVO {
+
+ private Long id;
+ private String code;
+ private String permitType;
+ @Schema(description = "浣滀笟绫诲瀷鍚嶇О")
+ private String permitTypeName;
+ private String title;
+ @Schema(description = "浣滀笟杞﹂棿缂栧彿")
+ private Long workshopId;
+ private String workshopName;
+ private String location;
+ private String workContent;
+ @Schema(description = "鐢宠浜虹紪鍙�")
+ private Long applicantId;
+ private String applicant;
+ private LocalDateTime applyTime;
+ private LocalDateTime planStartTime;
+ private LocalDateTime planEndTime;
+ private LocalDateTime actualStartTime;
+ private LocalDateTime actualEndTime;
+ private String riskLevel;
+ @Schema(description = "椋庨櫓绛夌骇鍚嶇О")
+ private String riskLevelName;
+ private String safetyMeasures;
+ @Schema(description = "瀹℃壒浜虹紪鍙�")
+ private Long approverId;
+ private String approver;
+ private LocalDateTime approveTime;
+ private String approveComment;
+ @Schema(description = "鐩戞姢浜虹紪鍙�")
+ private Long guardianId;
+ private String guardian;
+ private String status;
+ @Schema(description = "鐘舵�佸悕绉�")
+ private String statusName;
+ private String attachment;
+ private String photoUrls;
+ @Schema(description = "鐩戞姢浜烘槸鍚﹀繀濉紙鍔ㄧ伀/楂樺帇甯︾數/鏈夐檺绌洪棿锛�")
+ private Boolean guardianRequired;
+ private String remark;
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitSaveReqVO.java
new file mode 100644
index 0000000..92abbf2
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitSaveReqVO.java
@@ -0,0 +1,84 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.permit;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 楂樺嵄浣滀笟绁ㄧ敵璇�/淇敼 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 楂樺嵄浣滀笟绁ㄧ敵璇�/淇敼 Request VO")
+@Data
+public class SafetyWorkPermitSaveReqVO {
+
+ private Long id;
+
+ @Schema(description = "浣滀笟绫诲瀷", requiredMode = Schema.RequiredMode.REQUIRED, example = "HOT_WORK")
+ @NotBlank(message = "浣滀笟绫诲瀷涓嶈兘涓虹┖")
+ @Pattern(regexp = "HOT_WORK|LIVE_HIGH_VOLTAGE|LIMITED_SPACE|WORK_AT_HEIGHT|LIFTING|TEMP_ELECTRIC|OTHER",
+ message = "浣滀笟绫诲瀷涓嶅悎娉�")
+ private String permitType;
+
+ @Schema(description = "浣滀笟鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "2#涓诲彉妫�淇姩鐏�")
+ @NotBlank(message = "浣滀笟鍚嶇О涓嶈兘涓虹┖")
+ @Size(max = 200)
+ private String title;
+
+ @Schema(description = "浣滀笟杞﹂棿锛堝叧鑱� mes_md_workshop锛�")
+ private Long workshopId;
+
+ @Schema(description = "浣滀笟鍦扮偣")
+ @Size(max = 200)
+ private String location;
+
+ @Schema(description = "浣滀笟鍐呭涓庤寖鍥�")
+ @Size(max = 2000)
+ private String workContent;
+
+ @Schema(description = "鐢宠浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璇烽�夋嫨鐢宠浜�")
+ private Long applicantId;
+
+ @Schema(description = "鐢宠鏃堕棿")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+ private LocalDateTime applyTime;
+
+ @Schema(description = "璁″垝寮�濮嬫椂闂�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璁″垝寮�濮嬫椂闂翠笉鑳戒负绌�")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+ private LocalDateTime planStartTime;
+
+ @Schema(description = "璁″垝缁撴潫鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璁″垝缁撴潫鏃堕棿涓嶈兘涓虹┖")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+ private LocalDateTime planEndTime;
+
+ @Schema(description = "椋庨櫓绛夌骇", example = "HIGH")
+ @Pattern(regexp = "LOW|NORMAL|HIGH|VERY_HIGH", message = "椋庨櫓绛夌骇涓嶅悎娉�")
+ private String riskLevel;
+
+ @Schema(description = "瀹夊叏鎺柦")
+ @Size(max = 2000)
+ private String safetyMeasures;
+
+ @Schema(description = "鐩戞姢浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�")
+ private Long guardianId;
+
+ @Schema(description = "浣滀笟绁ㄩ檮浠� URL锛岄�楀彿鍒嗛殧")
+ @Size(max = 2000)
+ private String attachment;
+
+ @Schema(description = "鐜板満鐓х墖 URL锛岄�楀彿鍒嗛殧")
+ @Size(max = 2000)
+ private String photoUrls;
+
+ @Schema(description = "澶囨敞")
+ @Size(max = 500)
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentPageReqVO.java
new file mode 100644
index 0000000..0719cf2
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentPageReqVO.java
@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 浜嬫晠鐧昏鍒嗛〉 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 浜嬫晠鐧昏鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyAccidentPageReqVO extends PageParam {
+
+ private String code;
+ private String title;
+ private String accidentType;
+ private String level;
+ private String status;
+
+ @Schema(description = "鍙戠敓鏃堕棿鑼冨洿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime[] occurTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentRespVO.java
new file mode 100644
index 0000000..ac50c83
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentRespVO.java
@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 浜嬫晠鐧昏 Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 浜嬫晠鐧昏 Response VO")
+@Data
+public class SafetyAccidentRespVO {
+
+ private Long id;
+ private String code;
+ private String title;
+ private String accidentType;
+ @Schema(description = "浜嬫晠绫诲瀷鍚嶇О")
+ private String accidentTypeName;
+ private String level;
+ @Schema(description = "浜嬫晠绛夌骇鍚嶇О")
+ private String levelName;
+ private LocalDateTime occurTime;
+ private String location;
+ @Schema(description = "鎵�灞炶溅闂寸紪鍙�")
+ private Long workshopId;
+ private String workshopName;
+ private String casualtyDesc;
+ private BigDecimal economicLoss;
+ private String involvedPersons;
+ private String description;
+ private String causeAnalysis;
+ private String measures;
+ @Schema(description = "鐧昏浜虹紪鍙�")
+ private Long reporterId;
+ private String reporter;
+ private LocalDateTime reportTime;
+ private String status;
+ @Schema(description = "鐘舵�佸悕绉�")
+ private String statusName;
+ private String attachment;
+ private String remark;
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentSaveReqVO.java
new file mode 100644
index 0000000..3623785
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentSaveReqVO.java
@@ -0,0 +1,91 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 浜嬫晠鐧昏鏂板/淇敼 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 浜嬫晠鐧昏鏂板/淇敼 Request VO")
+@Data
+public class SafetyAccidentSaveReqVO {
+
+ private Long id;
+
+ @Schema(description = "浜嬫晠鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "10kV 寮�鍏虫煖璇搷浣滆Е鐢�")
+ @NotBlank(message = "浜嬫晠鍚嶇О涓嶈兘涓虹┖")
+ @Size(max = 200)
+ private String title;
+
+ @Schema(description = "浜嬫晠绫诲瀷", requiredMode = Schema.RequiredMode.REQUIRED, example = "ELECTRIC_SHOCK")
+ @NotBlank(message = "浜嬫晠绫诲瀷涓嶈兘涓虹┖")
+ @Pattern(regexp = "ELECTRIC_SHOCK|FIRE|FALL|OBJECT_STRIKE|MECHANICAL|CHEMICAL|VEHICLE|OTHER", message = "浜嬫晠绫诲瀷涓嶅悎娉�")
+ private String accidentType;
+
+ @Schema(description = "浜嬫晠绛夌骇", example = "GENERAL")
+ @Pattern(regexp = "SLIGHT|GENERAL|SEVERE|MAJOR", message = "浜嬫晠绛夌骇涓嶅悎娉�")
+ private String level;
+
+ @Schema(description = "鍙戠敓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "鍙戠敓鏃堕棿涓嶈兘涓虹┖")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+ private LocalDateTime occurTime;
+
+ @Schema(description = "鍙戠敓鍦扮偣")
+ @Size(max = 200)
+ private String location;
+
+ @Schema(description = "鎵�灞炶溅闂达紙鍏宠仈 mes_md_workshop锛�")
+ private Long workshopId;
+
+ @Schema(description = "浼や骸鎯呭喌")
+ @Size(max = 500)
+ private String casualtyDesc;
+
+ @Schema(description = "鐩存帴缁忔祹鎹熷け锛堝厓锛�")
+ @DecimalMin(value = "0", message = "缁忔祹鎹熷け涓嶈兘涓鸿礋鏁�")
+ private BigDecimal economicLoss;
+
+ @Schema(description = "娑変簨浜哄憳濮撳悕锛岄�楀彿鍒嗛殧")
+ @Size(max = 500)
+ private String involvedPersons;
+
+ @Schema(description = "浜嬫晠缁忚繃")
+ @Size(max = 2000)
+ private String description;
+
+ @Schema(description = "鍘熷洜鍒嗘瀽")
+ @Size(max = 2000)
+ private String causeAnalysis;
+
+ @Schema(description = "澶勭悊鎺柦涓庢暣鏀硅姹�")
+ @Size(max = 2000)
+ private String measures;
+
+ @Schema(description = "鐧昏浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�")
+ private Long reporterId;
+
+ @Schema(description = "鐧昏鏃堕棿")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+ private LocalDateTime reportTime;
+
+ @Schema(description = "鐘舵��", example = "REPORTED")
+ @Pattern(regexp = "REPORTED|INVESTIGATING|HANDLED|CLOSED", message = "鐘舵�佷笉鍚堟硶")
+ private String status;
+
+ @Schema(description = "鐜板満鐓х墖/璋冩煡鎶ュ憡 URL锛岄�楀彿鍒嗛殧")
+ @Size(max = 2000)
+ private String attachment;
+
+ @Schema(description = "澶囨敞")
+ @Size(max = 500)
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillPageReqVO.java
new file mode 100644
index 0000000..56b134a
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillPageReqVO.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 婕旂粌璁板綍鍒嗛〉 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 婕旂粌璁板綍鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyDrillPageReqVO extends PageParam {
+
+ private String title;
+ private String drillType;
+ private String organizer;
+
+ @Schema(description = "婕旂粌鏃ユ湡鑼冨洿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate[] drillDate;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillRespVO.java
new file mode 100644
index 0000000..8483740
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillRespVO.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 婕旂粌璁板綍 Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 婕旂粌璁板綍 Response VO")
+@Data
+public class SafetyDrillRespVO {
+
+ private Long id;
+ private String title;
+ private String drillType;
+ @Schema(description = "婕旂粌绫诲瀷鍚嶇О")
+ private String drillTypeName;
+ private LocalDate drillDate;
+ private String location;
+ @Schema(description = "缁勭粐浜虹紪鍙�")
+ private Long organizerId;
+ private String organizer;
+ private String participants;
+ private Integer participantCount;
+ private String planDesc;
+ private String processDesc;
+ private String summary;
+ private Integer durationMinutes;
+ private String attachment;
+ private String remark;
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillSaveReqVO.java
new file mode 100644
index 0000000..cf90a08
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillSaveReqVO.java
@@ -0,0 +1,74 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 娑堥槻婕旂粌璁板綍鏂板/淇敼 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 娑堥槻婕旂粌璁板綍鏂板/淇敼 Request VO")
+@Data
+public class SafetyDrillSaveReqVO {
+
+ private Long id;
+
+ @Schema(description = "婕旂粌鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "2026 骞村害娑堥槻鐤忔暎婕旂粌")
+ @NotBlank(message = "婕旂粌鍚嶇О涓嶈兘涓虹┖")
+ @Size(max = 200)
+ private String title;
+
+ @Schema(description = "婕旂粌绫诲瀷", example = "FIRE")
+ @Pattern(regexp = "FIRE|EMERGENCY_EVAC|ELECTRIC_ACCIDENT|CHEMICAL_LEAK|OTHER", message = "婕旂粌绫诲瀷涓嶅悎娉�")
+ private String drillType;
+
+ @Schema(description = "婕旂粌鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "婕旂粌鏃ユ湡涓嶈兘涓虹┖")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate drillDate;
+
+ @Schema(description = "婕旂粌鍦扮偣")
+ @Size(max = 200)
+ private String location;
+
+ @Schema(description = "缁勭粐浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�")
+ private Long organizerId;
+
+ @Schema(description = "鍙傚姞浜哄憳濮撳悕锛岄�楀彿鍒嗛殧")
+ @Size(max = 2000)
+ private String participants;
+
+ @Schema(description = "鍙傚姞浜烘暟")
+ @Min(value = 0, message = "鍙傚姞浜烘暟涓嶈兘涓鸿礋鏁�")
+ private Integer participantCount;
+
+ @Schema(description = "婕旂粌鏂规")
+ @Size(max = 2000)
+ private String planDesc;
+
+ @Schema(description = "婕旂粌杩囩▼璁板綍")
+ @Size(max = 2000)
+ private String processDesc;
+
+ @Schema(description = "婕旂粌鎬荤粨涓庢敼杩�")
+ @Size(max = 2000)
+ private String summary;
+
+ @Schema(description = "婕旂粌鏃堕暱锛堝垎閽燂級")
+ @Min(value = 0, message = "婕旂粌鏃堕暱涓嶈兘涓鸿礋鏁�")
+ private Integer durationMinutes;
+
+ @Schema(description = "婕旂粌鐓х墖/璁板綍琛� URL锛岄�楀彿鍒嗛殧")
+ @Size(max = 2000)
+ private String attachment;
+
+ @Schema(description = "澶囨敞")
+ @Size(max = 500)
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingPageReqVO.java
new file mode 100644
index 0000000..938efe1
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingPageReqVO.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鍩硅璁板綍鍒嗛〉 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鍩硅璁板綍鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyTrainingPageReqVO extends PageParam {
+
+ private String title;
+ private String trainingType;
+ private String trainer;
+
+ @Schema(description = "鍩硅鏃ユ湡鑼冨洿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate[] trainDate;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingRespVO.java
new file mode 100644
index 0000000..e79feb9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingRespVO.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鍩硅璁板綍 Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鍩硅璁板綍 Response VO")
+@Data
+public class SafetyTrainingRespVO {
+
+ private Long id;
+ private String title;
+ private String trainingType;
+ @Schema(description = "鍩硅绫诲瀷鍚嶇О")
+ private String trainingTypeName;
+ private LocalDate trainDate;
+ private BigDecimal durationHours;
+ @Schema(description = "璁插笀/缁勭粐浜虹紪鍙�")
+ private Long trainerId;
+ private String trainer;
+ private String location;
+ private String participants;
+ private Integer participantCount;
+ private String content;
+ private String examResult;
+ private String attachment;
+ private String remark;
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingSaveReqVO.java
new file mode 100644
index 0000000..9818d6a
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingSaveReqVO.java
@@ -0,0 +1,71 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鍩硅璁板綍鏂板/淇敼 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鍩硅璁板綍鏂板/淇敼 Request VO")
+@Data
+public class SafetyTrainingSaveReqVO {
+
+ private Long id;
+
+ @Schema(description = "鍩硅涓婚", requiredMode = Schema.RequiredMode.REQUIRED, example = "骞村害瀹夊叏瑙勭▼鍩硅")
+ @NotBlank(message = "鍩硅涓婚涓嶈兘涓虹┖")
+ @Size(max = 200)
+ private String title;
+
+ @Schema(description = "鍩硅绫诲瀷", example = "SAFETY")
+ @Pattern(regexp = "SAFETY|SKILL|LAW|EMERGENCY|INDUCTION|OTHER", message = "鍩硅绫诲瀷涓嶅悎娉�")
+ private String trainingType;
+
+ @Schema(description = "鍩硅鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "鍩硅鏃ユ湡涓嶈兘涓虹┖")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate trainDate;
+
+ @Schema(description = "鍩硅瀛︽椂", example = "2.0")
+ @DecimalMin(value = "0", message = "鍩硅瀛︽椂涓嶈兘涓鸿礋鏁�")
+ private BigDecimal durationHours;
+
+ @Schema(description = "璁插笀/缁勭粐浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�")
+ private Long trainerId;
+
+ @Schema(description = "鍩硅鍦扮偣")
+ @Size(max = 200)
+ private String location;
+
+ @Schema(description = "鍙傚姞浜哄憳濮撳悕锛岄�楀彿鍒嗛殧")
+ @Size(max = 2000)
+ private String participants;
+
+ @Schema(description = "鍙傚姞浜烘暟")
+ @Min(value = 0, message = "鍙傚姞浜烘暟涓嶈兘涓鸿礋鏁�")
+ private Integer participantCount;
+
+ @Schema(description = "鍩硅鍐呭")
+ @Size(max = 2000)
+ private String content;
+
+ @Schema(description = "鑰冩牳鎯呭喌")
+ @Size(max = 2000)
+ private String examResult;
+
+ @Schema(description = "绛惧埌琛�/璇句欢/鐓х墖 URL锛岄�楀彿鍒嗛殧")
+ @Size(max = 2000)
+ private String attachment;
+
+ @Schema(description = "澶囨敞")
+ @Size(max = 500)
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/tm/tool/MesTmToolController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/tm/tool/MesTmToolController.java
index bba9ac1..b0404c2 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/tm/tool/MesTmToolController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/tm/tool/MesTmToolController.java
@@ -123,7 +123,7 @@
.status(1).remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "宸ュ叿瀵煎叆妯℃澘.xls", "宸ュ叿鍒楄〃", MesTmToolImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "宸ュ叿瀵煎叆妯℃澘.xls", "宸ュ叿鍒楄〃", MesTmToolImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java
index ffe9bb8..1c6a090 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java
@@ -137,7 +137,7 @@
.remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "鍒拌揣閫氱煡鍗曞鍏ユā鏉�.xls", "鍒拌揣閫氱煡鍗曞垪琛�", MesWmArrivalNoticeImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鍒拌揣閫氱煡鍗曞鍏ユā鏉�.xls", "鍒拌揣閫氱煡鍗曞垪琛�", MesWmArrivalNoticeImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/equipmentreceipt/MesWmEquipmentReceiptController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/equipmentreceipt/MesWmEquipmentReceiptController.java
index af7439d..bc45e7e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/equipmentreceipt/MesWmEquipmentReceiptController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/equipmentreceipt/MesWmEquipmentReceiptController.java
@@ -120,7 +120,7 @@
.remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "璁惧鍏ュ簱鍗曞鍏ユā鏉�.xls", "璁惧鍏ュ簱鍗曞垪琛�", MesWmEquipmentReceiptImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "璁惧鍏ュ簱鍗曞鍏ユā鏉�.xls", "璁惧鍏ュ簱鍗曞垪琛�", MesWmEquipmentReceiptImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java
index a9d28da..23db4dd 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java
@@ -184,7 +184,7 @@
.remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "閲囪喘鍏ュ簱鍗曞鍏ユā鏉�.xls", "閲囪喘鍏ュ簱鍗曞垪琛�", MesWmItemReceiptImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "閲囪喘鍏ュ簱鍗曞鍏ユā鏉�.xls", "閲囪喘鍏ュ簱鍗曞垪琛�", MesWmItemReceiptImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java
index 0a28856..b40fee0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java
@@ -81,7 +81,7 @@
@Operation(summary = "涓嬭浇搴撳瓨瀵煎叆妯℃澘")
@PreAuthorize("@ss.hasPermission('mes:wm-material-stock:adjust')")
public void importTemplate(HttpServletResponse response) throws IOException {
- ExcelUtils.write(response, "搴撳瓨瀵煎叆妯℃澘.xls", "搴撳瓨鏄庣粏", MesWmStockImportExcelVO.class, Collections.emptyList());
+ ExcelUtils.writeTemplate(response, "搴撳瓨瀵煎叆妯℃澘.xls", "搴撳瓨鏄庣粏", MesWmStockImportExcelVO.class, Collections.emptyList());
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/MesWmMiscIssueController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/MesWmMiscIssueController.java
index 0dda2fd..068852a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/MesWmMiscIssueController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/MesWmMiscIssueController.java
@@ -151,7 +151,7 @@
.sourceDocType("").sourceDocCode("").remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "鏉傞」鍑哄簱鍗曞鍏ユā鏉�.xls", "鏉傞」鍑哄簱鍗曞垪琛�", MesWmMiscIssueImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鏉傞」鍑哄簱鍗曞鍏ユā鏉�.xls", "鏉傞」鍑哄簱鍗曞垪琛�", MesWmMiscIssueImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/MesWmMiscReceiptController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/MesWmMiscReceiptController.java
index 938ca10..b458f4c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/MesWmMiscReceiptController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/MesWmMiscReceiptController.java
@@ -145,7 +145,7 @@
.sourceDocType("").sourceDocCode("").remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "鏉傞」鍏ュ簱鍗曞鍏ユā鏉�.xls", "鏉傞」鍏ュ簱鍗曞垪琛�", MesWmMiscReceiptImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鏉傞」鍏ュ簱鍗曞鍏ユā鏉�.xls", "鏉傞」鍏ュ簱鍗曞垪琛�", MesWmMiscReceiptImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java
index 8422324..155e495 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java
@@ -162,7 +162,7 @@
.remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "澶栧崗鍙戞枡鍗曞鍏ユā鏉�.xls", "澶栧崗鍙戞枡鍗曞垪琛�", MesWmOutsourceIssueImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "澶栧崗鍙戞枡鍗曞鍏ユā鏉�.xls", "澶栧崗鍙戞枡鍗曞垪琛�", MesWmOutsourceIssueImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/MesWmOutsourceReceiptController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/MesWmOutsourceReceiptController.java
index a5d4283..715dcca 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/MesWmOutsourceReceiptController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/MesWmOutsourceReceiptController.java
@@ -155,7 +155,7 @@
.remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "澶栧崗鍏ュ簱鍗曞鍏ユā鏉�.xls", "澶栧崗鍏ュ簱鍗曞垪琛�", MesWmOutsourceReceiptImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "澶栧崗鍏ュ簱鍗曞鍏ユā鏉�.xls", "澶栧崗鍏ュ簱鍗曞垪琛�", MesWmOutsourceReceiptImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageController.java
index d04b317..6df58f0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageController.java
@@ -171,7 +171,7 @@
.width(new java.math.BigDecimal("40.00")).remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "瑁呯鍗曞鍏ユā鏉�.xls", "瑁呯鍗曞垪琛�", MesWmPackageImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "瑁呯鍗曞鍏ユā鏉�.xls", "瑁呯鍗曞垪琛�", MesWmPackageImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueController.java
index 86499f3..01dfdb4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueController.java
@@ -172,7 +172,7 @@
.remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "鐢熶骇棰嗘枡鍑哄簱鍗曞鍏ユā鏉�.xls", "鐢熶骇棰嗘枡鍑哄簱鍗曞垪琛�", MesWmProductIssueImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鐢熶骇棰嗘枡鍑哄簱鍗曞鍏ユā鏉�.xls", "鐢熶骇棰嗘枡鍑哄簱鍗曞垪琛�", MesWmProductIssueImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/MesWmProductReceiptController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/MesWmProductReceiptController.java
index f225987..8c46077 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/MesWmProductReceiptController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/MesWmProductReceiptController.java
@@ -169,7 +169,7 @@
.remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "浜у搧鏀惰揣鍗曞鍏ユā鏉�.xls", "浜у搧鏀惰揣鍗曞垪琛�", MesWmProductReceiptImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "浜у搧鏀惰揣鍗曞鍏ユā鏉�.xls", "浜у搧鏀惰揣鍗曞垪琛�", MesWmProductReceiptImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java
index 6dd91a9..6222b81 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java
@@ -169,7 +169,7 @@
.contactName("寮犱笁").remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "閿�鍞嚭搴撳崟瀵煎叆妯℃澘.xls", "閿�鍞嚭搴撳崟鍒楄〃", MesWmProductSalesImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "閿�鍞嚭搴撳崟瀵煎叆妯℃澘.xls", "閿�鍞嚭搴撳崟鍒楄〃", MesWmProductSalesImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueController.java
index 5b99aaa..8896258 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueController.java
@@ -159,7 +159,7 @@
.remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "鐢熶骇閫�鏂欏崟瀵煎叆妯℃澘.xls", "鐢熶骇閫�鏂欏崟鍒楄〃", MesWmReturnIssueImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鐢熶骇閫�鏂欏崟瀵煎叆妯℃澘.xls", "鐢熶骇閫�鏂欏崟鍒楄〃", MesWmReturnIssueImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesController.java
index a577ae4..dd79c64 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesController.java
@@ -159,7 +159,7 @@
.returnReason("璐ㄩ噺闂").remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "閿�鍞��璐у崟瀵煎叆妯℃澘.xls", "閿�鍞��璐у崟鍒楄〃", MesWmReturnSalesImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "閿�鍞��璐у崟瀵煎叆妯℃澘.xls", "閿�鍞��璐у崟鍒楄〃", MesWmReturnSalesImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorController.java
index 6b0c023..2e008d5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorController.java
@@ -176,7 +176,7 @@
.returnReason("璐ㄩ噺涓嶅悎鏍�").remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "渚涘簲鍟嗛��璐у崟瀵煎叆妯℃澘.xls", "渚涘簲鍟嗛��璐у崟鍒楄〃", MesWmReturnVendorImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "渚涘簲鍟嗛��璐у崟瀵煎叆妯℃澘.xls", "渚涘簲鍟嗛��璐у崟鍒楄〃", MesWmReturnVendorImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeController.java
index cc6ff78..160c6b2 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeController.java
@@ -140,7 +140,7 @@
.remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "鍙戣揣閫氱煡鍗曞鍏ユā鏉�.xls", "鍙戣揣閫氱煡鍗曞垪琛�", MesWmSalesNoticeImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鍙戣揣閫氱煡鍗曞鍏ユā鏉�.xls", "鍙戣揣閫氱煡鍗曞垪琛�", MesWmSalesNoticeImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/MesWmTransferController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/MesWmTransferController.java
index 4c7d0bc..36737f4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/MesWmTransferController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/MesWmTransferController.java
@@ -150,7 +150,7 @@
.recipientName("寮犱笁").remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "杞Щ鍗曞鍏ユā鏉�.xls", "杞Щ鍗曞垪琛�", MesWmTransferImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "杞Щ鍗曞鍏ユā鏉�.xls", "杞Щ鍗曞垪琛�", MesWmTransferImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyAccidentDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyAccidentDO.java
new file mode 100644
index 0000000..925beba
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyAccidentDO.java
@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 浜嬫晠鐧昏 DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("safety_accident")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyAccidentDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /** 浜嬫晠缂栧彿 */
+ private String code;
+ /** 浜嬫晠鍚嶇О */
+ private String title;
+ /** 浜嬫晠绫诲瀷锛岃 SafetyAccidentTypeEnum */
+ private String accidentType;
+ /** 浜嬫晠绛夌骇锛岃 SafetyAccidentLevelEnum */
+ private String level;
+ /** 鍙戠敓鏃堕棿 */
+ private LocalDateTime occurTime;
+ /** 鍙戠敓鍦扮偣 */
+ private String location;
+ /** 鎵�灞炶溅闂达紙鍏宠仈 mes_md_workshop.id锛� */
+ private Long workshopId;
+ /** 鎵�灞炶溅闂村悕绉帮紙蹇収锛岀敱杞﹂棿涓绘暟鎹甫鍑猴級 */
+ private String workshopName;
+ /** 浼や骸鎯呭喌 */
+ private String casualtyDesc;
+ /** 鐩存帴缁忔祹鎹熷け锛堝厓锛� */
+ private BigDecimal economicLoss;
+ /** 娑変簨浜哄憳濮撳悕锛岄�楀彿鍒嗛殧 */
+ private String involvedPersons;
+ /** 浜嬫晠缁忚繃 */
+ private String description;
+ /** 鍘熷洜鍒嗘瀽 */
+ private String causeAnalysis;
+ /** 澶勭悊鎺柦涓庢暣鏀硅姹� */
+ private String measures;
+ /** 鐧昏浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long reporterId;
+ /** 鐧昏浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String reporter;
+ /** 鐧昏鏃堕棿 */
+ private LocalDateTime reportTime;
+ /** 鐘舵�侊紝瑙� SafetyAccidentStatusEnum */
+ private String status;
+ /** 鐜板満鐓х墖/璋冩煡鎶ュ憡 URL锛岄�楀彿鍒嗛殧 */
+ private String attachment;
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyCertificateDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyCertificateDO.java
new file mode 100644
index 0000000..8eb951c
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyCertificateDO.java
@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗圭浣滀笟璇佸彴璐� DO
+ *
+ * <p>瑕嗙洊鐢靛伐璇併�侀珮鍘嬫搷浣滆瘉绛夌壒绉嶄綔涓氳祫鏍艰瘉浠讹紝鎸夋湁鏁堟湡鑷姩鍒ゆ柇鐘舵�佸苟棰勮銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("safety_certificate")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyCertificateDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /**
+ * 鎸佽瘉浜猴紙鍛樺伐缂栧彿锛�
+ *
+ * 鍏宠仈 HrmEmployeeDO#getId()锛屽鍚�/宸ュ彿/閮ㄩ棬鍧囩敱姝ゅ叧鑱斿甫鍑�
+ */
+ private Long employeeId;
+ /** 鎸佽瘉浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛岀敤浜庡憳宸ユ。妗堝彉鏇村悗杩芥函寮�璇佹椂淇℃伅锛� */
+ private String employeeName;
+ /** 宸ュ彿锛堝揩鐓э級 */
+ private String employeeNo;
+ /** 鎵�灞為儴闂紙蹇収锛� */
+ private String deptName;
+ /** 璇佷欢绫诲瀷锛岃 SafetyCertificateTypeEnum */
+ private String certType;
+ /** 璇佷欢缂栧彿 */
+ private String certNo;
+ /** 鍙戣瘉鏈哄叧 */
+ private String issuer;
+ /** 鍙戣瘉鏃ユ湡 */
+ private LocalDate issueDate;
+ /** 鏈夋晥鏈熻嚦 */
+ private LocalDate expireDate;
+ /** 涓嬫澶嶅鏃ユ湡 */
+ private LocalDate reviewDate;
+ /** 鍒版湡棰勮鎻愬墠澶╂暟 */
+ private Integer warnDays;
+ /** 鐘舵�侊紝瑙� SafetyCertificateStatusEnum */
+ private String status;
+ /** 璇佷欢鎵弿浠� URL锛岄�楀彿鍒嗛殧 */
+ private String attachment;
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyDrillDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyDrillDO.java
new file mode 100644
index 0000000..55f560d
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyDrillDO.java
@@ -0,0 +1,51 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 娑堥槻婕旂粌璁板綍 DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("safety_drill")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyDrillDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /** 婕旂粌鍚嶇О */
+ private String title;
+ /** 婕旂粌绫诲瀷锛岃 SafetyDrillTypeEnum */
+ private String drillType;
+ /** 婕旂粌鏃ユ湡 */
+ private LocalDate drillDate;
+ /** 婕旂粌鍦扮偣 */
+ private String location;
+ /** 缁勭粐浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long organizerId;
+ /** 缁勭粐浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String organizer;
+ /** 鍙傚姞浜哄憳濮撳悕锛岄�楀彿鍒嗛殧 */
+ private String participants;
+ /** 鍙傚姞浜烘暟 */
+ private Integer participantCount;
+ /** 婕旂粌鏂规 */
+ private String planDesc;
+ /** 婕旂粌杩囩▼璁板綍 */
+ private String processDesc;
+ /** 婕旂粌鎬荤粨涓庢敼杩� */
+ private String summary;
+ /** 婕旂粌鏃堕暱锛堝垎閽燂級 */
+ private Integer durationMinutes;
+ /** 婕旂粌鐓х墖/璁板綍琛� URL锛岄�楀彿鍒嗛殧 */
+ private String attachment;
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyHazardDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyHazardDO.java
new file mode 100644
index 0000000..2e5eb9c
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyHazardDO.java
@@ -0,0 +1,82 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅鐧昏涓庨棴鐜� DO
+ *
+ * <p>瀹屾暣闂幆锛氫笂鎶� 鈫� 鍒嗘淳 鈫� 鏁存敼 鈫� 澶嶆煡锛堥�氳繃鍒欓棴鐜紝涓嶉�氳繃閫�鍥炴暣鏀癸級銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("safety_hazard")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyHazardDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /** 闅愭偅缂栧彿 */
+ private String code;
+ /** 闅愭偅鏍囬 */
+ private String title;
+ /** 闅愭偅绛夌骇锛岃 SafetyHazardLevelEnum */
+ private String level;
+ /** 鏉ユ簮锛岃 SafetyHazardSourceEnum */
+ private String source;
+ /** 鍏宠仈宸℃璁板綍缂栧彿 */
+ private Long inspectionId;
+ /** 鍏宠仈宸℃鐐逛綅缂栧彿 */
+ private Long pointId;
+ /** 鐐逛綅鍚嶇О */
+ private String pointName;
+ /** 闅愭偅浣嶇疆 */
+ private String location;
+ /** 闅愭偅鎻忚堪 */
+ private String description;
+ /** 鐜板満鐓х墖 URL锛岄�楀彿鍒嗛殧锛堢Щ鍔ㄧ鎷嶇収涓婁紶锛� */
+ private String photoUrls;
+ /** 涓婃姤浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long reporterId;
+ /** 涓婃姤浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String reporter;
+ /** 涓婃姤鏃堕棿 */
+ private LocalDateTime reportTime;
+ /** 鏁存敼璐d换浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long assigneeId;
+ /** 鏁存敼璐d换浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String assignee;
+ /** 鍒嗘淳鏃堕棿 */
+ private LocalDateTime assignTime;
+ /** 鏁存敼鏈熼檺 */
+ private LocalDate rectifyDeadline;
+ /** 鏁存敼鎺柦涓庣粨鏋� */
+ private String rectifyDesc;
+ /** 鏁存敼鍚庣収鐗� URL锛岄�楀彿鍒嗛殧 */
+ private String rectifyPhotoUrls;
+ /** 鏁存敼瀹屾垚鏃堕棿 */
+ private LocalDateTime rectifyTime;
+ /** 澶嶆煡浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long recheckerId;
+ /** 澶嶆煡浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String rechecker;
+ /** 澶嶆煡鏃堕棿 */
+ private LocalDateTime recheckTime;
+ /** 澶嶆煡缁撹锛歅ASSED-閫氳繃锛孯EJECTED-涓嶉�氳繃 */
+ private String recheckResult;
+ /** 澶嶆煡鎰忚 */
+ private String recheckRemark;
+ /** 鐘舵�侊紝瑙� SafetyHazardStatusEnum */
+ private String status;
+ /** 闂幆鏃堕棿 */
+ private LocalDateTime closeTime;
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionDO.java
new file mode 100644
index 0000000..6e59aba
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionDO.java
@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃璁板綍 DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("safety_inspection")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyInspectionDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /** 宸℃鐐逛綅缂栧彿 */
+ private Long pointId;
+ /** 鐐逛綅鍚嶇О锛堝揩鐓э級 */
+ private String pointName;
+ /** 鐐逛綅绫诲瀷锛堝揩鐓э級 */
+ private String pointType;
+ /** 宸℃鏃堕棿 */
+ private LocalDateTime inspectTime;
+ /** 宸℃浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long inspectorId;
+ /** 宸℃浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String inspector;
+ /** 宸℃缁撴灉锛歂ORMAL-姝e父锛孉BNORMAL-寮傚父 */
+ private String result;
+ /** 宸℃鍐呭涓庢儏鍐� */
+ private String content;
+ /** 鐜板満鐓х墖 URL锛岄�楀彿鍒嗛殧 */
+ private String photoUrls;
+ /** 鏈鍙戠幇鐨勯殣鎮f暟 */
+ private Integer hazardCount;
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionPointDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionPointDO.java
new file mode 100644
index 0000000..a9f0302
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionPointDO.java
@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃鐐逛綅 DO
+ *
+ * <p>楂樺帇閰嶇數瀹ゃ�佹満缁勫尯绛夋棩甯稿畨鍏ㄥ贰妫�鐐逛綅銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("safety_inspection_point")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyInspectionPointDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /** 鐐逛綅缂栫爜 */
+ private String code;
+ /** 鐐逛綅鍚嶇О */
+ private String name;
+ /** 鐐逛綅绫诲瀷锛岃 SafetyInspectionPointTypeEnum */
+ private String pointType;
+ /** 鎵�灞炶溅闂达紙鍏宠仈 mes_md_workshop.id锛� */
+ private Long workshopId;
+ /** 鎵�灞炶溅闂村悕绉帮紙蹇収锛岀敱杞﹂棿涓绘暟鎹甫鍑猴級 */
+ private String workshopName;
+ /** 鍏蜂綋浣嶇疆 */
+ private String location;
+ /** 宸℃椤圭洰娓呭崟锛屾寜琛屽垎闅� */
+ private String inspectItems;
+ /** 宸℃鍛ㄦ湡锛岃 SafetyInspectCycleEnum */
+ private String inspectCycle;
+ /** 璐d换浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long ownerId;
+ /** 璐d换浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String ownerName;
+ /** 鐘舵�侊細0-鍚敤锛�1-鍋滅敤 */
+ private Integer status;
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyMaterialDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyMaterialDO.java
new file mode 100644
index 0000000..e9a5f7e
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyMaterialDO.java
@@ -0,0 +1,54 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 搴旀��/瀹夊叏鐗╄祫鍙拌处 DO
+ *
+ * <p>鐢靛姏缁濈紭鐢ㄥ叿銆佸嵄鍖栧搧銆佹秷闃茬墿璧勭瓑銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("safety_material")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyMaterialDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /** 鐗╄祫缂栫爜 */
+ private String code;
+ /** 鐗╄祫鍚嶇О */
+ private String name;
+ /** 绫诲埆锛岃 SafetyMaterialCategoryEnum */
+ private String category;
+ /** 瑙勬牸鍨嬪彿 */
+ private String spec;
+ /** 璁¢噺鍗曚綅 */
+ private String unit;
+ /** 褰撳墠搴撳瓨鏁伴噺 */
+ private BigDecimal stockQty;
+ /** 瀹夊叏搴撳瓨锛堜綆浜庡垯棰勮锛� */
+ private BigDecimal safeStock;
+ /** 瀛樻斁浣嶇疆 */
+ private String storageLocation;
+ /** 鏈夋晥鏈熻嚦锛堢粷缂�/鍗卞寲鍝佸繀濉級 */
+ private LocalDate expireDate;
+ /** 鏈夋晥鏈熸湀鏁� */
+ private Integer validityMonths;
+ /** 淇濈浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long managerId;
+ /** 淇濈浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String manager;
+ /** 鐘舵�侊細0-鍚敤锛�1-鍋滅敤 */
+ private Integer status;
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyMaterialStockDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyMaterialStockDO.java
new file mode 100644
index 0000000..15bf901
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyMaterialStockDO.java
@@ -0,0 +1,48 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗╄祫鍑哄叆搴撴祦姘� DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("safety_material_stock")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyMaterialStockDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /** 鐗╄祫缂栧彿 */
+ private Long materialId;
+ /** 鐗╄祫鍚嶇О锛堝揩鐓э級 */
+ private String materialName;
+ /** 鐗╄祫绫诲埆锛堝揩鐓э級 */
+ private String category;
+ /** 涓氬姟绫诲瀷锛欼N-鍏ュ簱锛孫UT-鍑哄簱 */
+ private String bizType;
+ /** 鏁伴噺 */
+ private BigDecimal quantity;
+ /** 鎿嶄綔鍓嶅簱瀛� */
+ private BigDecimal stockBefore;
+ /** 鎿嶄綔鍚庡簱瀛� */
+ private BigDecimal stockAfter;
+ /** 涓氬姟鏃ユ湡 */
+ private LocalDate bizDate;
+ /** 缁忓姙浜� */
+ private String operator;
+ /** 棰嗙敤浜猴紙鍑哄簱锛� */
+ private String receiver;
+ /** 鐢ㄩ��/鍘诲悜 */
+ private String purpose;
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyOrgDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyOrgDO.java
new file mode 100644
index 0000000..118e977
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyOrgDO.java
@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 瀹夊叏鐢熶骇 - 瀹夊叏缁勭粐鏋舵瀯 DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("safety_org")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyOrgDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /** 鐖剁骇缂栧彿锛�0 涓洪《绾� */
+ private Long parentId;
+ /** 缁勭粐鍚嶇О锛屽瀹夊叏鐢熶骇濮斿憳浼氥�佸畨鍏ㄧ鐞嗛儴 */
+ private String name;
+ /** 璐熻矗浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long leaderId;
+ /** 璐熻矗浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String leaderName;
+ /** 璐熻矗浜虹數璇� */
+ private String leaderPhone;
+ /** 鎴愬憳濮撳悕锛岄�楀彿鍒嗛殧 */
+ private String memberNames;
+ /** 瀹夊叏鑱岃矗 */
+ private String duty;
+ /** 鏄剧ず椤哄簭 */
+ private Integer sort;
+ /** 鐘舵�侊細0-鍚敤锛�1-鍋滅敤 */
+ private Integer status;
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyTrainingDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyTrainingDO.java
new file mode 100644
index 0000000..4b782d9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyTrainingDO.java
@@ -0,0 +1,50 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 瀹夊叏鍩硅璁板綍 DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("safety_training")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyTrainingDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /** 鍩硅涓婚 */
+ private String title;
+ /** 鍩硅绫诲瀷锛岃 SafetyTrainingTypeEnum */
+ private String trainingType;
+ /** 鍩硅鏃ユ湡 */
+ private LocalDate trainDate;
+ /** 鍩硅瀛︽椂 */
+ private BigDecimal durationHours;
+ /** 璁插笀/缁勭粐浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long trainerId;
+ /** 璁插笀/缁勭粐浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String trainer;
+ /** 鍩硅鍦扮偣 */
+ private String location;
+ /** 鍙傚姞浜哄憳濮撳悕锛岄�楀彿鍒嗛殧 */
+ private String participants;
+ /** 鍙傚姞浜烘暟 */
+ private Integer participantCount;
+ /** 鍩硅鍐呭 */
+ private String content;
+ /** 鑰冩牳鎯呭喌 */
+ private String examResult;
+ /** 绛惧埌琛�/璇句欢/鐓х墖 URL锛岄�楀彿鍒嗛殧 */
+ private String attachment;
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitDO.java
new file mode 100644
index 0000000..02fa4cd
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitDO.java
@@ -0,0 +1,77 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 楂樺嵄浣滀笟绁� DO
+ *
+ * <p>鍔ㄧ伀銆侀珮鍘嬪甫鐢点�佹湁闄愮┖闂寸瓑浣滀笟鐨勭嚎涓婂鎵逛笌鐢靛瓙鐣欏瓨銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("safety_work_permit")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyWorkPermitDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /** 浣滀笟绁ㄧ紪鍙� */
+ private String code;
+ /** 浣滀笟绫诲瀷锛岃 SafetyPermitTypeEnum */
+ private String permitType;
+ /** 浣滀笟鍚嶇О */
+ private String title;
+ /** 浣滀笟杞﹂棿锛堝叧鑱� mes_md_workshop.id锛� */
+ private Long workshopId;
+ /** 浣滀笟杞﹂棿鍚嶇О锛堝揩鐓э紝鐢辫溅闂翠富鏁版嵁甯﹀嚭锛� */
+ private String workshopName;
+ /** 浣滀笟鍦扮偣 */
+ private String location;
+ /** 浣滀笟鍐呭涓庤寖鍥� */
+ private String workContent;
+ /** 鐢宠浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long applicantId;
+ /** 鐢宠浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String applicant;
+ /** 鐢宠鏃堕棿 */
+ private LocalDateTime applyTime;
+ /** 璁″垝寮�濮嬫椂闂� */
+ private LocalDateTime planStartTime;
+ /** 璁″垝缁撴潫鏃堕棿 */
+ private LocalDateTime planEndTime;
+ /** 瀹為檯寮�濮嬫椂闂� */
+ private LocalDateTime actualStartTime;
+ /** 瀹為檯缁撴潫鏃堕棿 */
+ private LocalDateTime actualEndTime;
+ /** 椋庨櫓绛夌骇锛岃 SafetyRiskLevelEnum */
+ private String riskLevel;
+ /** 瀹夊叏鎺柦 */
+ private String safetyMeasures;
+ /** 瀹℃壒浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long approverId;
+ /** 瀹℃壒浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String approver;
+ /** 瀹℃壒鏃堕棿 */
+ private LocalDateTime approveTime;
+ /** 瀹℃壒鎰忚 */
+ private String approveComment;
+ /** 鐩戞姢浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long guardianId;
+ /** 鐩戞姢浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String guardian;
+ /** 鐘舵�侊紝瑙� SafetyPermitStatusEnum */
+ private String status;
+ /** 浣滀笟绁ㄩ檮浠� URL锛岄�楀彿鍒嗛殧 */
+ private String attachment;
+ /** 鐜板満鐓х墖 URL锛岄�楀彿鍒嗛殧 */
+ private String photoUrls;
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitMonitorDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitMonitorDO.java
new file mode 100644
index 0000000..fb4d375
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitMonitorDO.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 浣滀笟鐩戞姢璁板綍 DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("safety_work_permit_monitor")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyWorkPermitMonitorDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /** 浣滀笟绁ㄧ紪鍙� */
+ private Long permitId;
+ /** 鐩戞姢鏃堕棿 */
+ private LocalDateTime monitorTime;
+ /** 鐩戞姢浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long guardianId;
+ /** 鐩戞姢浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String guardian;
+ /** 鐩戞姢鍐呭涓庢儏鍐� */
+ private String monitorContent;
+ /** 寮傚父鎯呭喌涓庡缃� */
+ private String abnormal;
+ /** 鐜板満鐓х墖 URL锛岄�楀彿鍒嗛殧 */
+ private String photoUrls;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/repair/MesDvRepairMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/repair/MesDvRepairMapper.java
index 8605e9c..75fb140 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/repair/MesDvRepairMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/repair/MesDvRepairMapper.java
@@ -15,6 +15,14 @@
@Mapper
public interface MesDvRepairMapper extends BaseMapperX<MesDvRepairDO> {
+ /**
+ * 鍔犺閿佹煡璇㈢淮淇伐鍗曪細澶囦欢鍑哄簱鏃堕槻姝㈠苟鍙戞墸鍑�
+ */
+ default MesDvRepairDO lockForSpare(Long id) {
+ return selectOne(new LambdaQueryWrapperX<MesDvRepairDO>()
+ .eq(MesDvRepairDO::getId, id).last("FOR UPDATE"));
+ }
+
default PageResult<MesDvRepairDO> selectPage(MesDvRepairPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<MesDvRepairDO>()
.likeIfPresent(MesDvRepairDO::getCode, reqVO.getCode())
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ledger/MesQcInspectionLedgerMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ledger/MesQcInspectionLedgerMapper.java
new file mode 100644
index 0000000..3a27ea3
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ledger/MesQcInspectionLedgerMapper.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.qc.ledger;
+
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo.MesQcInspectionLedgerPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo.MesQcInspectionLedgerRespVO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * MES 妫�娴嬬粨鏋滃彴璐� Mapper
+ *
+ * 浣跨敤 UNION ALL SQL 浠庡洓绫绘楠屽崟锛圛QC/IPQC/OQC/RQC锛夋媺鍙栨楠屽崟锛屽啀鍏宠仈妫�楠岀粨鏋滄槑缁嗕笌妫�娴嬮」锛屼竴琛屼竴涓娴嬮」缁撴灉
+ */
+@Mapper
+public interface MesQcInspectionLedgerMapper {
+
+ IPage<MesQcInspectionLedgerRespVO> selectInspectionLedgerPage(IPage<MesQcInspectionLedgerRespVO> page,
+ @Param("reqVO") MesQcInspectionLedgerPageReqVO reqVO);
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyAccidentMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyAccidentMapper.java
new file mode 100644
index 0000000..4510bfd
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyAccidentMapper.java
@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train.SafetyAccidentPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyAccidentDO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 浜嬫晠鐧昏 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface SafetyAccidentMapper extends BaseMapperX<SafetyAccidentDO> {
+
+ default PageResult<SafetyAccidentDO> selectPage(SafetyAccidentPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<SafetyAccidentDO>()
+ .likeIfPresent(SafetyAccidentDO::getCode, reqVO.getCode())
+ .likeIfPresent(SafetyAccidentDO::getTitle, reqVO.getTitle())
+ .eqIfPresent(SafetyAccidentDO::getAccidentType, reqVO.getAccidentType())
+ .eqIfPresent(SafetyAccidentDO::getLevel, reqVO.getLevel())
+ .eqIfPresent(SafetyAccidentDO::getStatus, reqVO.getStatus())
+ .betweenIfPresent(SafetyAccidentDO::getOccurTime, reqVO.getOccurTime())
+ .orderByDesc(SafetyAccidentDO::getOccurTime)
+ .orderByDesc(SafetyAccidentDO::getId));
+ }
+
+ default List<SafetyAccidentDO> selectListBetween(java.time.LocalDateTime begin, java.time.LocalDateTime end) {
+ return selectList(new LambdaQueryWrapperX<SafetyAccidentDO>()
+ .geIfPresent(SafetyAccidentDO::getOccurTime, begin)
+ .leIfPresent(SafetyAccidentDO::getOccurTime, end)
+ .orderByAsc(SafetyAccidentDO::getOccurTime));
+ }
+
+ @Select("SELECT CONCAT(#{prefix}, LPAD(COUNT(*) + 1, 4, '0')) FROM safety_accident WHERE code LIKE CONCAT(#{prefix}, '%')")
+ String selectNextCode(@Param("prefix") String prefix);
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyCertificateMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyCertificateMapper.java
new file mode 100644
index 0000000..a889686
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyCertificateMapper.java
@@ -0,0 +1,46 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert.SafetyCertificatePageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyCertificateDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗圭浣滀笟璇� Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface SafetyCertificateMapper extends BaseMapperX<SafetyCertificateDO> {
+
+ default PageResult<SafetyCertificateDO> selectPage(SafetyCertificatePageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<SafetyCertificateDO>()
+ .likeIfPresent(SafetyCertificateDO::getEmployeeName, reqVO.getEmployeeName())
+ .likeIfPresent(SafetyCertificateDO::getEmployeeNo, reqVO.getEmployeeNo())
+ .likeIfPresent(SafetyCertificateDO::getDeptName, reqVO.getDeptName())
+ .eqIfPresent(SafetyCertificateDO::getCertType, reqVO.getCertType())
+ .eqIfPresent(SafetyCertificateDO::getStatus, reqVO.getStatus())
+ .likeIfPresent(SafetyCertificateDO::getCertNo, reqVO.getCertNo())
+ .geIfPresent(SafetyCertificateDO::getExpireDate, reqVO.getExpireDateStart())
+ .leIfPresent(SafetyCertificateDO::getExpireDate, reqVO.getExpireDateEnd())
+ .orderByAsc(SafetyCertificateDO::getExpireDate)
+ .orderByDesc(SafetyCertificateDO::getId));
+ }
+
+ default SafetyCertificateDO selectByCertNo(String certNo) {
+ return selectOne(SafetyCertificateDO::getCertNo, certNo);
+ }
+
+ /** 鏌ヨ鍗冲皢鍒版湡鎴栧凡杩囨湡鐨勮瘉浠讹紙expireDate <= 鎴鏃ユ湡锛� */
+ default List<SafetyCertificateDO> selectExpiringBefore(LocalDate deadline) {
+ return selectList(new LambdaQueryWrapperX<SafetyCertificateDO>()
+ .le(SafetyCertificateDO::getExpireDate, deadline)
+ .orderByAsc(SafetyCertificateDO::getExpireDate));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyDrillMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyDrillMapper.java
new file mode 100644
index 0000000..6d47be5
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyDrillMapper.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train.SafetyDrillPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyDrillDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 婕旂粌璁板綍 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface SafetyDrillMapper extends BaseMapperX<SafetyDrillDO> {
+
+ default PageResult<SafetyDrillDO> selectPage(SafetyDrillPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<SafetyDrillDO>()
+ .likeIfPresent(SafetyDrillDO::getTitle, reqVO.getTitle())
+ .eqIfPresent(SafetyDrillDO::getDrillType, reqVO.getDrillType())
+ .likeIfPresent(SafetyDrillDO::getOrganizer, reqVO.getOrganizer())
+ .betweenIfPresent(SafetyDrillDO::getDrillDate, reqVO.getDrillDate())
+ .orderByDesc(SafetyDrillDO::getDrillDate)
+ .orderByDesc(SafetyDrillDO::getId));
+ }
+
+ default List<SafetyDrillDO> selectListBetween(java.time.LocalDate begin, java.time.LocalDate end) {
+ return selectList(new LambdaQueryWrapperX<SafetyDrillDO>()
+ .geIfPresent(SafetyDrillDO::getDrillDate, begin)
+ .leIfPresent(SafetyDrillDO::getDrillDate, end)
+ .orderByAsc(SafetyDrillDO::getDrillDate));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyHazardMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyHazardMapper.java
new file mode 100644
index 0000000..cf2bd48
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyHazardMapper.java
@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard.SafetyHazardPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyHazardDO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface SafetyHazardMapper extends BaseMapperX<SafetyHazardDO> {
+
+ default PageResult<SafetyHazardDO> selectPage(SafetyHazardPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<SafetyHazardDO>()
+ .likeIfPresent(SafetyHazardDO::getCode, reqVO.getCode())
+ .likeIfPresent(SafetyHazardDO::getTitle, reqVO.getTitle())
+ .eqIfPresent(SafetyHazardDO::getLevel, reqVO.getLevel())
+ .eqIfPresent(SafetyHazardDO::getSource, reqVO.getSource())
+ .eqIfPresent(SafetyHazardDO::getStatus, reqVO.getStatus())
+ .likeIfPresent(SafetyHazardDO::getAssignee, reqVO.getAssignee())
+ .likeIfPresent(SafetyHazardDO::getLocation, reqVO.getLocation())
+ .geIfPresent(SafetyHazardDO::getReportTime, reqVO.getReportTimeStart())
+ .leIfPresent(SafetyHazardDO::getReportTime, reqVO.getReportTimeEnd())
+ .orderByDesc(SafetyHazardDO::getReportTime)
+ .orderByDesc(SafetyHazardDO::getId));
+ }
+
+ /** 瓒呰繃鏁存敼鏈熼檺涓旀湭闂幆鐨勯殣鎮� */
+ default List<SafetyHazardDO> selectOverdue(java.time.LocalDate today) {
+ return selectList(new LambdaQueryWrapperX<SafetyHazardDO>()
+ .lt(SafetyHazardDO::getRectifyDeadline, today)
+ .notIn(SafetyHazardDO::getStatus, "CLOSED")
+ .orderByAsc(SafetyHazardDO::getRectifyDeadline));
+ }
+
+ /** 鐢熸垚闅愭偅缂栧彿锛欻Z + yyyyMMdd + 4 浣嶆祦姘� */
+ @Select("SELECT CONCAT(#{prefix}, LPAD(COUNT(*) + 1, 4, '0')) FROM safety_hazard WHERE code LIKE CONCAT(#{prefix}, '%')")
+ String selectNextCode(@Param("prefix") String prefix);
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyInspectionMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyInspectionMapper.java
new file mode 100644
index 0000000..c1ba9fb
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyInspectionMapper.java
@@ -0,0 +1,51 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.inspection.SafetyInspectionPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyInspectionDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃璁板綍 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface SafetyInspectionMapper extends BaseMapperX<SafetyInspectionDO> {
+
+ default PageResult<SafetyInspectionDO> selectPage(SafetyInspectionPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<SafetyInspectionDO>()
+ .eqIfPresent(SafetyInspectionDO::getPointId, reqVO.getPointId())
+ .eqIfPresent(SafetyInspectionDO::getPointType, reqVO.getPointType())
+ .likeIfPresent(SafetyInspectionDO::getInspector, reqVO.getInspector())
+ .eqIfPresent(SafetyInspectionDO::getResult, reqVO.getResult())
+ .betweenIfPresent(SafetyInspectionDO::getInspectTime, reqVO.getInspectTime())
+ .orderByDesc(SafetyInspectionDO::getInspectTime)
+ .orderByDesc(SafetyInspectionDO::getId));
+ }
+
+ default List<SafetyInspectionDO> selectListByTimeRange(LocalDateTime begin, LocalDateTime end) {
+ return selectList(new LambdaQueryWrapperX<SafetyInspectionDO>()
+ .geIfPresent(SafetyInspectionDO::getInspectTime, begin)
+ .leIfPresent(SafetyInspectionDO::getInspectTime, end)
+ .orderByAsc(SafetyInspectionDO::getInspectTime));
+ }
+
+ default Long selectCountByPointId(Long pointId) {
+ return selectCount(SafetyInspectionDO::getPointId, pointId);
+ }
+
+ /** 鏌ヨ鏌愮偣浣嶆渶杩戜竴娆″贰妫�璁板綍 */
+ default SafetyInspectionDO selectLatestByPointId(Long pointId) {
+ return selectOne(new LambdaQueryWrapperX<SafetyInspectionDO>()
+ .eq(SafetyInspectionDO::getPointId, pointId)
+ .orderByDesc(SafetyInspectionDO::getInspectTime)
+ .last("LIMIT 1"));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyInspectionPointMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyInspectionPointMapper.java
new file mode 100644
index 0000000..144985d
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyInspectionPointMapper.java
@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.inspection.SafetyInspectionPointPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyInspectionPointDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃鐐逛綅 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface SafetyInspectionPointMapper extends BaseMapperX<SafetyInspectionPointDO> {
+
+ default PageResult<SafetyInspectionPointDO> selectPage(SafetyInspectionPointPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<SafetyInspectionPointDO>()
+ .likeIfPresent(SafetyInspectionPointDO::getCode, reqVO.getCode())
+ .likeIfPresent(SafetyInspectionPointDO::getName, reqVO.getName())
+ .eqIfPresent(SafetyInspectionPointDO::getPointType, reqVO.getPointType())
+ .likeIfPresent(SafetyInspectionPointDO::getWorkshopName, reqVO.getWorkshopName())
+ .eqIfPresent(SafetyInspectionPointDO::getStatus, reqVO.getStatus())
+ .orderByAsc(SafetyInspectionPointDO::getCode));
+ }
+
+ default SafetyInspectionPointDO selectByCode(String code) {
+ return selectOne(SafetyInspectionPointDO::getCode, code);
+ }
+
+ default List<SafetyInspectionPointDO> selectListByStatus(Integer status) {
+ return selectList(new LambdaQueryWrapperX<SafetyInspectionPointDO>()
+ .eq(SafetyInspectionPointDO::getStatus, status)
+ .orderByAsc(SafetyInspectionPointDO::getCode));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyMaterialMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyMaterialMapper.java
new file mode 100644
index 0000000..5cdfaf5
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyMaterialMapper.java
@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.material.SafetyMaterialPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyMaterialDO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗╄祫鍙拌处 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface SafetyMaterialMapper extends BaseMapperX<SafetyMaterialDO> {
+
+ default PageResult<SafetyMaterialDO> selectPage(SafetyMaterialPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<SafetyMaterialDO>()
+ .likeIfPresent(SafetyMaterialDO::getCode, reqVO.getCode())
+ .likeIfPresent(SafetyMaterialDO::getName, reqVO.getName())
+ .eqIfPresent(SafetyMaterialDO::getCategory, reqVO.getCategory())
+ .eqIfPresent(SafetyMaterialDO::getStatus, reqVO.getStatus())
+ .likeIfPresent(SafetyMaterialDO::getStorageLocation, reqVO.getStorageLocation())
+ .orderByAsc(SafetyMaterialDO::getCategory)
+ .orderByAsc(SafetyMaterialDO::getCode));
+ }
+
+ default SafetyMaterialDO selectByCode(String code) {
+ return selectOne(SafetyMaterialDO::getCode, code);
+ }
+
+ /** 閿佸畾搴撳瓨琛岋紝閬垮厤骞跺彂鍑哄叆搴撳鑷村簱瀛橀敊涔� */
+ @Select("SELECT * FROM safety_material WHERE id = #{id} AND deleted = b'0' FOR UPDATE")
+ SafetyMaterialDO selectByIdForUpdate(@Param("id") Long id);
+
+ /** 浣庝簬瀹夊叏搴撳瓨鐨勭墿璧� */
+ default List<SafetyMaterialDO> selectBelowSafeStock() {
+ return selectList(new LambdaQueryWrapperX<SafetyMaterialDO>()
+ .apply("stock_qty < safe_stock")
+ .orderByAsc(SafetyMaterialDO::getCode));
+ }
+
+ /** 鏈夋晥鏈熶复杩戠殑鐗╄祫 */
+ default List<SafetyMaterialDO> selectExpiringBefore(LocalDate deadline) {
+ return selectList(new LambdaQueryWrapperX<SafetyMaterialDO>()
+ .isNotNull(SafetyMaterialDO::getExpireDate)
+ .le(SafetyMaterialDO::getExpireDate, deadline)
+ .orderByAsc(SafetyMaterialDO::getExpireDate));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyMaterialStockMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyMaterialStockMapper.java
new file mode 100644
index 0000000..46120d4
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyMaterialStockMapper.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.material.SafetyMaterialStockPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyMaterialStockDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗╄祫鍑哄叆搴撴祦姘� Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface SafetyMaterialStockMapper extends BaseMapperX<SafetyMaterialStockDO> {
+
+ default PageResult<SafetyMaterialStockDO> selectPage(SafetyMaterialStockPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<SafetyMaterialStockDO>()
+ .eqIfPresent(SafetyMaterialStockDO::getMaterialId, reqVO.getMaterialId())
+ .likeIfPresent(SafetyMaterialStockDO::getMaterialName, reqVO.getMaterialName())
+ .eqIfPresent(SafetyMaterialStockDO::getCategory, reqVO.getCategory())
+ .eqIfPresent(SafetyMaterialStockDO::getBizType, reqVO.getBizType())
+ .betweenIfPresent(SafetyMaterialStockDO::getBizDate, reqVO.getBizDate())
+ .orderByDesc(SafetyMaterialStockDO::getBizDate)
+ .orderByDesc(SafetyMaterialStockDO::getId));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyOrgMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyOrgMapper.java
new file mode 100644
index 0000000..6a98fd5
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyOrgMapper.java
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyOrgDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 缁勭粐鏋舵瀯 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface SafetyOrgMapper extends BaseMapperX<SafetyOrgDO> {
+
+ default List<SafetyOrgDO> selectListOrdered() {
+ return selectList(new LambdaQueryWrapperX<SafetyOrgDO>()
+ .orderByAsc(SafetyOrgDO::getSort)
+ .orderByAsc(SafetyOrgDO::getId));
+ }
+
+ default List<SafetyOrgDO> selectListByParentId(Long parentId) {
+ return selectList(new LambdaQueryWrapperX<SafetyOrgDO>()
+ .eq(SafetyOrgDO::getParentId, parentId)
+ .orderByAsc(SafetyOrgDO::getSort));
+ }
+
+ default Long selectCountByParentId(Long parentId) {
+ return selectCount(SafetyOrgDO::getParentId, parentId);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyTrainingMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyTrainingMapper.java
new file mode 100644
index 0000000..303a5ac
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyTrainingMapper.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train.SafetyTrainingPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyTrainingDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鍩硅璁板綍 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface SafetyTrainingMapper extends BaseMapperX<SafetyTrainingDO> {
+
+ default PageResult<SafetyTrainingDO> selectPage(SafetyTrainingPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<SafetyTrainingDO>()
+ .likeIfPresent(SafetyTrainingDO::getTitle, reqVO.getTitle())
+ .eqIfPresent(SafetyTrainingDO::getTrainingType, reqVO.getTrainingType())
+ .likeIfPresent(SafetyTrainingDO::getTrainer, reqVO.getTrainer())
+ .betweenIfPresent(SafetyTrainingDO::getTrainDate, reqVO.getTrainDate())
+ .orderByDesc(SafetyTrainingDO::getTrainDate)
+ .orderByDesc(SafetyTrainingDO::getId));
+ }
+
+ default List<SafetyTrainingDO> selectListBetween(java.time.LocalDate begin, java.time.LocalDate end) {
+ return selectList(new LambdaQueryWrapperX<SafetyTrainingDO>()
+ .geIfPresent(SafetyTrainingDO::getTrainDate, begin)
+ .leIfPresent(SafetyTrainingDO::getTrainDate, end)
+ .orderByAsc(SafetyTrainingDO::getTrainDate));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyWorkPermitMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyWorkPermitMapper.java
new file mode 100644
index 0000000..a7885d5
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyWorkPermitMapper.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.permit.SafetyWorkPermitPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyWorkPermitDO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * 瀹夊叏鐢熶骇 - 楂樺嵄浣滀笟绁� Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface SafetyWorkPermitMapper extends BaseMapperX<SafetyWorkPermitDO> {
+
+ default PageResult<SafetyWorkPermitDO> selectPage(SafetyWorkPermitPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<SafetyWorkPermitDO>()
+ .likeIfPresent(SafetyWorkPermitDO::getCode, reqVO.getCode())
+ .likeIfPresent(SafetyWorkPermitDO::getTitle, reqVO.getTitle())
+ .eqIfPresent(SafetyWorkPermitDO::getPermitType, reqVO.getPermitType())
+ .eqIfPresent(SafetyWorkPermitDO::getStatus, reqVO.getStatus())
+ .eqIfPresent(SafetyWorkPermitDO::getRiskLevel, reqVO.getRiskLevel())
+ .likeIfPresent(SafetyWorkPermitDO::getApplicant, reqVO.getApplicant())
+ .likeIfPresent(SafetyWorkPermitDO::getWorkshopName, reqVO.getWorkshopName())
+ .betweenIfPresent(SafetyWorkPermitDO::getPlanStartTime, reqVO.getPlanStartTime())
+ .orderByDesc(SafetyWorkPermitDO::getApplyTime)
+ .orderByDesc(SafetyWorkPermitDO::getId));
+ }
+
+ @Select("SELECT CONCAT(#{prefix}, LPAD(COUNT(*) + 1, 4, '0')) FROM safety_work_permit WHERE code LIKE CONCAT(#{prefix}, '%')")
+ String selectNextCode(@Param("prefix") String prefix);
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyWorkPermitMonitorMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyWorkPermitMonitorMapper.java
new file mode 100644
index 0000000..1a9c0d5
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyWorkPermitMonitorMapper.java
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyWorkPermitMonitorDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 浣滀笟鐩戞姢璁板綍 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface SafetyWorkPermitMonitorMapper extends BaseMapperX<SafetyWorkPermitMonitorDO> {
+
+ default List<SafetyWorkPermitMonitorDO> selectListByPermitId(Long permitId) {
+ return selectList(new LambdaQueryWrapperX<SafetyWorkPermitMonitorDO>()
+ .eq(SafetyWorkPermitMonitorDO::getPermitId, permitId)
+ .orderByDesc(SafetyWorkPermitMonitorDO::getMonitorTime));
+ }
+
+ default int deleteByPermitId(Long permitId) {
+ return delete(SafetyWorkPermitMonitorDO::getPermitId, permitId);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
index 67dbcd6..16601b4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
@@ -614,7 +614,7 @@
ErrorCode WM_PRODUCT_ISSUE_WORKSTATION_NOT_EXISTS = new ErrorCode(1_040_708_005, "宸ヤ綔绔欎笉瀛樺湪");
ErrorCode WM_PRODUCT_ISSUE_CANCEL_NOT_ALLOWED = new ErrorCode(1_040_708_006, "鐢熶骇棰嗘枡鍑哄簱鍗曞凡瀹屾垚鎴栧凡鍙栨秷锛屾棤娉曞彇娑�");
ErrorCode WM_PRODUCT_ISSUE_LINE_NOT_EXISTS = new ErrorCode(1_040_708_100, "鐢熶骇棰嗘枡鍑哄簱鍗曡涓嶅瓨鍦�");
- ErrorCode WM_PRODUCT_ISSUE_LINE_ITEM_NOT_IN_BOM = new ErrorCode(1_040_708_101, "褰撳墠鐗╂枡涓嶅湪鐢熶骇宸ュ崟鐨� BOM 鐗╂枡娓呭崟涓�");
+ ErrorCode WM_PRODUCT_ISSUE_LINE_ITEM_NOT_IN_BOM = new ErrorCode(1_040_708_101, "褰撳墠鐗╂枡涓嶅湪鐢熶骇宸ュ崟鎴栧綋鍓嶄换鍔″伐搴忕殑 BOM 鐗╂枡娓呭崟涓�");
ErrorCode WM_PRODUCT_ISSUE_CODE_DUPLICATE = new ErrorCode(1_040_708_102, "棰嗘枡鍑哄簱鍗曠紪鐮佸凡瀛樺湪");
ErrorCode WM_PRODUCT_ISSUE_DETAIL_NOT_EXISTS = new ErrorCode(1_040_708_200, "鐢熶骇棰嗘枡鍑哄簱鍗曟槑缁嗕笉瀛樺湪");
ErrorCode WM_PRODUCT_ISSUE_DETAIL_ITEM_MISMATCH = new ErrorCode(1_040_708_201, "鎷h揣鏄庣粏鐨勭墿鏂欎笌棰嗘枡鍗曡鐨勭墿鏂欎笉涓�鑷�");
@@ -1001,4 +1001,5 @@
ErrorCode PD_CTC_REEL_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_040_960_010, "瀵煎叆鐩樺叿璁$畻鏁版嵁涓嶈兘涓虹┖锛�");
ErrorCode PD_TECH_CONFIRM_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_040_960_011, "瀵煎叆鎶�鏈‘璁ゅ嚱鏁版嵁涓嶈兘涓虹┖锛�");
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/SafetyErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/SafetyErrorCodeConstants.java
new file mode 100644
index 0000000..c7647c4
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/SafetyErrorCodeConstants.java
@@ -0,0 +1,67 @@
+package cn.iocoder.yudao.module.mes.enums;
+
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+
+/**
+ * MES 妯″潡閿欒鐮� - 瀹夊叏鐢熶骇瀛愭ā鍧�
+ *
+ * 瀹夊叏鐢熶骇妯″潡閿欒鐮佸尯闂达細1_040_960_xxx
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface SafetyErrorCodeConstants {
+
+ // ========== 瀹夊叏缁勭粐鏋舵瀯 1_040_961_xxx ==========
+ ErrorCode SAFETY_ORG_NOT_EXISTS = new ErrorCode(1_040_961_000, "瀹夊叏缁勭粐涓嶅瓨鍦�");
+ ErrorCode SAFETY_ORG_PARENT_NOT_EXISTS = new ErrorCode(1_040_961_001, "鐖剁骇瀹夊叏缁勭粐涓嶅瓨鍦�");
+ ErrorCode SAFETY_ORG_PARENT_IS_SELF = new ErrorCode(1_040_961_002, "涓婄骇缁勭粐涓嶈兘閫夋嫨鑷繁");
+ ErrorCode SAFETY_ORG_PARENT_IS_CHILD = new ErrorCode(1_040_961_003, "涓婄骇缁勭粐涓嶈兘閫夋嫨鑷繁鐨勫瓙缁勭粐");
+ ErrorCode SAFETY_ORG_HAS_CHILDREN = new ErrorCode(1_040_961_004, "瀛樺湪瀛愮粍缁囷紝鏃犳硶鍒犻櫎");
+
+ // ========== 鐗圭浣滀笟璇� 1_040_962_xxx ==========
+ ErrorCode SAFETY_CERT_NOT_EXISTS = new ErrorCode(1_040_962_000, "鐗圭浣滀笟璇佷笉瀛樺湪");
+ ErrorCode SAFETY_CERT_NO_DUPLICATE = new ErrorCode(1_040_962_001, "璇佷欢缂栧彿宸插瓨鍦�");
+ ErrorCode SAFETY_CERT_EXPIRE_BEFORE_ISSUE = new ErrorCode(1_040_962_002, "鏈夋晥鏈熶笉鑳芥棭浜庡彂璇佹棩鏈�");
+ ErrorCode SAFETY_CERT_EMPLOYEE_NOT_EXISTS = new ErrorCode(1_040_962_003, "鎸佽瘉浜轰笉瀛樺湪锛岃浠庡憳宸ユ。妗堜腑閫夋嫨");
+
+ // ========== 宸℃鐐逛綅 / 宸℃璁板綍 1_040_963_xxx ==========
+ ErrorCode SAFETY_POINT_NOT_EXISTS = new ErrorCode(1_040_963_000, "宸℃鐐逛綅涓嶅瓨鍦�");
+ ErrorCode SAFETY_POINT_CODE_DUPLICATE = new ErrorCode(1_040_963_001, "鐐逛綅缂栫爜宸插瓨鍦�");
+ ErrorCode SAFETY_POINT_DISABLED = new ErrorCode(1_040_963_002, "宸℃鐐逛綅宸插仠鐢�");
+ ErrorCode SAFETY_INSPECTION_NOT_EXISTS = new ErrorCode(1_040_963_010, "宸℃璁板綍涓嶅瓨鍦�");
+
+ // ========== 闅愭偅闂幆 1_040_964_xxx ==========
+ ErrorCode SAFETY_HAZARD_NOT_EXISTS = new ErrorCode(1_040_964_000, "闅愭偅璁板綍涓嶅瓨鍦�");
+ ErrorCode SAFETY_HAZARD_STATUS_ERROR = new ErrorCode(1_040_964_001, "褰撳墠闅愭偅鐘舵�佷笉鍏佽璇ユ搷浣�");
+ ErrorCode SAFETY_HAZARD_ASSIGNEE_REQUIRED = new ErrorCode(1_040_964_002, "鍒嗘淳蹇呴』鎸囧畾鏁存敼璐d换浜�");
+ ErrorCode SAFETY_HAZARD_SAME_OPERATOR = new ErrorCode(1_040_964_003, "鏁存敼浜轰笌澶嶆煡浜轰笉鑳芥槸鍚屼竴浜�");
+
+ // ========== 楂樺嵄浣滀笟绁� 1_040_965_xxx ==========
+ ErrorCode SAFETY_PERMIT_NOT_EXISTS = new ErrorCode(1_040_965_000, "浣滀笟绁ㄤ笉瀛樺湪");
+ ErrorCode SAFETY_PERMIT_STATUS_ERROR = new ErrorCode(1_040_965_001, "褰撳墠浣滀笟绁ㄧ姸鎬佷笉鍏佽璇ユ搷浣�");
+ ErrorCode SAFETY_PERMIT_TIME_INVALID = new ErrorCode(1_040_965_002, "璁″垝缁撴潫鏃堕棿蹇呴』鏅氫簬寮�濮嬫椂闂�");
+ ErrorCode SAFETY_PERMIT_NOT_APPROVED = new ErrorCode(1_040_965_003, "浣滀笟绁ㄦ湭瀹℃壒閫氳繃锛屼笉鑳藉紑濮嬩綔涓�");
+ ErrorCode SAFETY_PERMIT_GUARDIAN_REQUIRED = new ErrorCode(1_040_965_004, "楂樺嵄浣滀笟蹇呴』鎸囧畾鐩戞姢浜�");
+ ErrorCode SAFETY_PERMIT_SELF_APPROVE = new ErrorCode(1_040_965_005, "鐢宠浜轰笉鑳藉鎵硅嚜宸辩殑浣滀笟绁�");
+ ErrorCode SAFETY_PERMIT_MONITOR_NOT_EXISTS = new ErrorCode(1_040_965_010, "鐩戞姢璁板綍涓嶅瓨鍦�");
+
+ // ========== 鐗╄祫鍙拌处 1_040_966_xxx ==========
+ ErrorCode SAFETY_MATERIAL_NOT_EXISTS = new ErrorCode(1_040_966_000, "鐗╄祫涓嶅瓨鍦�");
+ ErrorCode SAFETY_MATERIAL_CODE_DUPLICATE = new ErrorCode(1_040_966_001, "鐗╄祫缂栫爜宸插瓨鍦�");
+ ErrorCode SAFETY_MATERIAL_STOCK_NOT_ENOUGH = new ErrorCode(1_040_966_002, "搴撳瓨涓嶈冻锛屾棤娉曞嚭搴�");
+ ErrorCode SAFETY_MATERIAL_STOCK_RECORD_NOT_EXISTS = new ErrorCode(1_040_966_010, "鍑哄叆搴撴祦姘翠笉瀛樺湪");
+
+ // ========== 鍩硅 / 婕旂粌 / 浜嬫晠 1_040_967_xxx ==========
+ ErrorCode SAFETY_TRAINING_NOT_EXISTS = new ErrorCode(1_040_967_000, "鍩硅璁板綍涓嶅瓨鍦�");
+ ErrorCode SAFETY_DRILL_NOT_EXISTS = new ErrorCode(1_040_967_010, "婕旂粌璁板綍涓嶅瓨鍦�");
+ ErrorCode SAFETY_ACCIDENT_NOT_EXISTS = new ErrorCode(1_040_967_020, "浜嬫晠璁板綍涓嶅瓨鍦�");
+
+ // ========== 涓绘暟鎹紩鐢� 1_040_969_xxx ==========
+ ErrorCode SAFETY_WORKSHOP_NOT_EXISTS = new ErrorCode(1_040_969_000, "杞﹂棿涓嶅瓨鍦紝璇蜂粠杞﹂棿涓绘暟鎹腑閫夋嫨");
+ ErrorCode SAFETY_EMPLOYEE_REQUIRED = new ErrorCode(1_040_969_001, "璇烽�夋嫨鍛樺伐");
+
+ // ========== 鍙拌处瀵煎嚭 1_040_968_xxx ==========
+ ErrorCode SAFETY_LEDGER_EXPORT_ITEM_UNKNOWN = new ErrorCode(1_040_968_000, "鏈煡鐨勫彴璐﹀鍑洪」");
+ ErrorCode SAFETY_LEDGER_DATE_RANGE_INVALID = new ErrorCode(1_040_968_001, "寮�濮嬫棩鏈熶笉鑳芥櫄浜庣粨鏉熸棩鏈�");
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyAccidentLevelEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyAccidentLevelEnum.java
new file mode 100644
index 0000000..83fa149
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyAccidentLevelEnum.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 浜嬫晠绛夌骇鏋氫妇
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyAccidentLevelEnum {
+
+ SLIGHT("SLIGHT", "杞讳激浜嬫晠"),
+ GENERAL("GENERAL", "涓�鑸簨鏁�"),
+ SEVERE("SEVERE", "閲嶄激浜嬫晠"),
+ MAJOR("MAJOR", "閲嶅ぇ浜嬫晠");
+
+ private final String level;
+ private final String name;
+
+ public static String getNameByLevel(String level) {
+ for (SafetyAccidentLevelEnum value : values()) {
+ if (value.getLevel().equals(level)) {
+ return value.getName();
+ }
+ }
+ return level;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyAccidentStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyAccidentStatusEnum.java
new file mode 100644
index 0000000..5740185
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyAccidentStatusEnum.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 浜嬫晠澶勭悊鐘舵�佹灇涓�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyAccidentStatusEnum {
+
+ REPORTED("REPORTED", "宸茬櫥璁�"),
+ INVESTIGATING("INVESTIGATING", "璋冩煡涓�"),
+ HANDLED("HANDLED", "宸插鐞�"),
+ CLOSED("CLOSED", "宸茬粨妗�");
+
+ private final String status;
+ private final String name;
+
+ public static String getNameByStatus(String status) {
+ for (SafetyAccidentStatusEnum value : values()) {
+ if (value.getStatus().equals(status)) {
+ return value.getName();
+ }
+ }
+ return status;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyAccidentTypeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyAccidentTypeEnum.java
new file mode 100644
index 0000000..9a75e71
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyAccidentTypeEnum.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 浜嬫晠绫诲瀷鏋氫妇
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyAccidentTypeEnum {
+
+ ELECTRIC_SHOCK("ELECTRIC_SHOCK", "瑙︾數"),
+ FIRE("FIRE", "鐏伨"),
+ FALL("FALL", "楂樺鍧犺惤"),
+ OBJECT_STRIKE("OBJECT_STRIKE", "鐗╀綋鎵撳嚮"),
+ MECHANICAL("MECHANICAL", "鏈烘浼ゅ"),
+ CHEMICAL("CHEMICAL", "涓瘨绐掓伅"),
+ VEHICLE("VEHICLE", "杞﹁締浼ゅ"),
+ OTHER("OTHER", "鍏朵粬");
+
+ private final String type;
+ private final String name;
+
+ public static String getNameByType(String type) {
+ for (SafetyAccidentTypeEnum value : values()) {
+ if (value.getType().equals(type)) {
+ return value.getName();
+ }
+ }
+ return type;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyCertificateStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyCertificateStatusEnum.java
new file mode 100644
index 0000000..26af9fa
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyCertificateStatusEnum.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗圭浣滀笟璇佺姸鎬佹灇涓�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyCertificateStatusEnum {
+
+ VALID("VALID", "鏈夋晥"),
+ EXPIRING("EXPIRING", "鍗冲皢鍒版湡"),
+ EXPIRED("EXPIRED", "宸茶繃鏈�"),
+ REVOKED("REVOKED", "宸叉敞閿�");
+
+ private final String status;
+ private final String name;
+
+ public static String getNameByStatus(String status) {
+ for (SafetyCertificateStatusEnum value : values()) {
+ if (value.getStatus().equals(status)) {
+ return value.getName();
+ }
+ }
+ return status;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyCertificateTypeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyCertificateTypeEnum.java
new file mode 100644
index 0000000..26ba238
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyCertificateTypeEnum.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗圭浣滀笟璇佺被鍨嬫灇涓�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyCertificateTypeEnum {
+
+ LOW_VOLTAGE_ELECTRICIAN("LOW_VOLTAGE_ELECTRICIAN", "浣庡帇鐢靛伐璇�"),
+ HIGH_VOLTAGE_OPERATION("HIGH_VOLTAGE_OPERATION", "楂樺帇鎿嶄綔璇�"),
+ WELDING("WELDING", "鐒婃帴涓庣儹鍒囧壊浣滀笟璇�"),
+ HOIST("HOIST", "璧烽噸鏈烘浣滀笟璇�"),
+ HEIGHT_WORK("HEIGHT_WORK", "楂樺浣滀笟璇�"),
+ LIMITED_SPACE("LIMITED_SPACE", "鏈夐檺绌洪棿浣滀笟璇�"),
+ FORKLIFT("FORKLIFT", "鍙夎溅浣滀笟璇�"),
+ BOILER("BOILER", "閿呯倝浣滀笟璇�"),
+ OTHER("OTHER", "鍏朵粬鐗圭浣滀笟璇�");
+
+ private final String type;
+ private final String name;
+
+ public static String getNameByType(String type) {
+ for (SafetyCertificateTypeEnum value : values()) {
+ if (value.getType().equals(type)) {
+ return value.getName();
+ }
+ }
+ return type;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyDrillTypeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyDrillTypeEnum.java
new file mode 100644
index 0000000..e49eb76
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyDrillTypeEnum.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 婕旂粌绫诲瀷鏋氫妇
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyDrillTypeEnum {
+
+ FIRE("FIRE", "娑堥槻婕旂粌"),
+ EMERGENCY_EVAC("EMERGENCY_EVAC", "搴旀�ョ枏鏁f紨缁�"),
+ ELECTRIC_ACCIDENT("ELECTRIC_ACCIDENT", "瑙︾數浜嬫晠婕旂粌"),
+ CHEMICAL_LEAK("CHEMICAL_LEAK", "鍗卞寲鍝佹硠婕忔紨缁�"),
+ OTHER("OTHER", "鍏朵粬婕旂粌");
+
+ private final String type;
+ private final String name;
+
+ public static String getNameByType(String type) {
+ for (SafetyDrillTypeEnum value : values()) {
+ if (value.getType().equals(type)) {
+ return value.getName();
+ }
+ }
+ return type;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyHazardLevelEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyHazardLevelEnum.java
new file mode 100644
index 0000000..ddb9945
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyHazardLevelEnum.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅绛夌骇鏋氫妇
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyHazardLevelEnum {
+
+ GENERAL("GENERAL", "涓�鑸殣鎮�"),
+ MAJOR("MAJOR", "閲嶅ぇ闅愭偅");
+
+ private final String level;
+ private final String name;
+
+ public static String getNameByLevel(String level) {
+ for (SafetyHazardLevelEnum value : values()) {
+ if (value.getLevel().equals(level)) {
+ return value.getName();
+ }
+ }
+ return level;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyHazardSourceEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyHazardSourceEnum.java
new file mode 100644
index 0000000..44cc510
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyHazardSourceEnum.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅鏉ユ簮鏋氫妇
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyHazardSourceEnum {
+
+ INSPECTION("INSPECTION", "宸℃鍙戠幇"),
+ SELF_CHECK("SELF_CHECK", "鑷煡涓婃姤"),
+ REPORT("REPORT", "鍛樺伐涓婃姤"),
+ EXTERNAL("EXTERNAL", "澶栭儴妫�鏌�");
+
+ private final String source;
+ private final String name;
+
+ public static String getNameBySource(String source) {
+ for (SafetyHazardSourceEnum value : values()) {
+ if (value.getSource().equals(source)) {
+ return value.getName();
+ }
+ }
+ return source;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyHazardStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyHazardStatusEnum.java
new file mode 100644
index 0000000..300926a
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyHazardStatusEnum.java
@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅鐘舵�佹灇涓�
+ *
+ * <p>娴佽浆椤哄簭锛氫笂鎶� 鈫� 鍒嗘淳 鈫� 鏁存敼涓� 鈫� 寰呭鏌� 鈫� 宸查棴鐜� / 澶嶆煡涓嶉�氳繃锛堥��鍥炴暣鏀癸級銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyHazardStatusEnum {
+
+ REPORTED("REPORTED", "宸蹭笂鎶�"),
+ ASSIGNED("ASSIGNED", "宸插垎娲�"),
+ RECTIFYING("RECTIFYING", "鏁存敼涓�"),
+ RECHECKING("RECHECKING", "寰呭鏌�"),
+ REJECTED("REJECTED", "澶嶆煡涓嶉�氳繃"),
+ CLOSED("CLOSED", "宸查棴鐜�");
+
+ private final String status;
+ private final String name;
+
+ public static String getNameByStatus(String status) {
+ for (SafetyHazardStatusEnum value : values()) {
+ if (value.getStatus().equals(status)) {
+ return value.getName();
+ }
+ }
+ return status;
+ }
+
+ public static boolean isFinished(String status) {
+ return CLOSED.getStatus().equals(status);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyInspectCycleEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyInspectCycleEnum.java
new file mode 100644
index 0000000..adb7654
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyInspectCycleEnum.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃鍛ㄦ湡鏋氫妇
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyInspectCycleEnum {
+
+ SHIFT("SHIFT", "姣忕彮"),
+ DAILY("DAILY", "姣忔棩"),
+ WEEKLY("WEEKLY", "姣忓懆"),
+ MONTHLY("MONTHLY", "姣忔湀");
+
+ private final String cycle;
+ private final String name;
+
+ public static String getNameByCycle(String cycle) {
+ for (SafetyInspectCycleEnum value : values()) {
+ if (value.getCycle().equals(cycle)) {
+ return value.getName();
+ }
+ }
+ return cycle;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyInspectionPointTypeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyInspectionPointTypeEnum.java
new file mode 100644
index 0000000..a0e94f9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyInspectionPointTypeEnum.java
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃鐐逛綅绫诲瀷鏋氫妇
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyInspectionPointTypeEnum {
+
+ HIGH_VOLTAGE_ROOM("HIGH_VOLTAGE_ROOM", "楂樺帇閰嶇數瀹�"),
+ UNIT_AREA("UNIT_AREA", "鏈虹粍鍖�"),
+ DANGER_CHEMICAL("DANGER_CHEMICAL", "鍗卞寲鍝佸簱"),
+ FIRE_AREA("FIRE_AREA", "娑堥槻閲嶇偣閮ㄤ綅"),
+ WORKSHOP("WORKSHOP", "鐢熶骇杞﹂棿"),
+ OTHER("OTHER", "鍏朵粬");
+
+ private final String type;
+ private final String name;
+
+ public static String getNameByType(String type) {
+ for (SafetyInspectionPointTypeEnum value : values()) {
+ if (value.getType().equals(type)) {
+ return value.getName();
+ }
+ }
+ return type;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyMaterialCategoryEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyMaterialCategoryEnum.java
new file mode 100644
index 0000000..bdfb0f6
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyMaterialCategoryEnum.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗╄祫绫诲埆鏋氫妇
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyMaterialCategoryEnum {
+
+ INSULATING("INSULATING", "鐢靛姏缁濈紭鐢ㄥ叿"),
+ HAZARD_CHEMICAL("HAZARD_CHEMICAL", "鍗卞寲鍝�"),
+ FIRE("FIRE", "娑堥槻鐗╄祫"),
+ PPE("PPE", "鍔充繚鐢ㄥ搧"),
+ OTHER("OTHER", "鍏朵粬");
+
+ private final String category;
+ private final String name;
+
+ public static String getNameByCategory(String category) {
+ for (SafetyMaterialCategoryEnum value : values()) {
+ if (value.getCategory().equals(category)) {
+ return value.getName();
+ }
+ }
+ return category;
+ }
+
+ /** 鏄惁闇�瑕佹湁鏁堟湡绠$悊锛堢粷缂樼敤鍏蜂笌鍗卞寲鍝佹湁淇濊川鏈燂級 */
+ public static boolean requiresExpireDate(String category) {
+ return INSULATING.getCategory().equals(category) || HAZARD_CHEMICAL.getCategory().equals(category);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyPermitStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyPermitStatusEnum.java
new file mode 100644
index 0000000..6ce6ab7
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyPermitStatusEnum.java
@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 楂樺嵄浣滀笟绁ㄧ姸鎬佹灇涓�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyPermitStatusEnum {
+
+ DRAFT("DRAFT", "鑽夌"),
+ PENDING("PENDING", "寰呭鎵�"),
+ APPROVED("APPROVED", "宸叉壒鍑�"),
+ REJECTED("REJECTED", "宸查┏鍥�"),
+ IN_PROGRESS("IN_PROGRESS", "浣滀笟涓�"),
+ CLOSED("CLOSED", "宸插畬缁�"),
+ CANCELLED("CANCELLED", "宸蹭綔搴�");
+
+ private final String status;
+ private final String name;
+
+ public static String getNameByStatus(String status) {
+ for (SafetyPermitStatusEnum value : values()) {
+ if (value.getStatus().equals(status)) {
+ return value.getName();
+ }
+ }
+ return status;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyPermitTypeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyPermitTypeEnum.java
new file mode 100644
index 0000000..4717df9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyPermitTypeEnum.java
@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 楂樺嵄浣滀笟绁ㄧ被鍨嬫灇涓�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyPermitTypeEnum {
+
+ HOT_WORK("HOT_WORK", "鍔ㄧ伀浣滀笟"),
+ LIVE_HIGH_VOLTAGE("LIVE_HIGH_VOLTAGE", "楂樺帇甯︾數浣滀笟"),
+ LIMITED_SPACE("LIMITED_SPACE", "鏈夐檺绌洪棿浣滀笟"),
+ WORK_AT_HEIGHT("WORK_AT_HEIGHT", "楂樺浣滀笟"),
+ LIFTING("LIFTING", "鍚婅浣滀笟"),
+ TEMP_ELECTRIC("TEMP_ELECTRIC", "涓存椂鐢ㄧ數浣滀笟"),
+ OTHER("OTHER", "鍏朵粬浣滀笟");
+
+ private final String type;
+ private final String name;
+
+ public static String getNameByType(String type) {
+ for (SafetyPermitTypeEnum value : values()) {
+ if (value.getType().equals(type)) {
+ return value.getName();
+ }
+ }
+ return type;
+ }
+
+ /** 鏄惁蹇呴』鎸囧畾鐩戞姢浜� */
+ public static boolean requiresGuardian(String type) {
+ return HOT_WORK.getType().equals(type) || LIVE_HIGH_VOLTAGE.getType().equals(type)
+ || LIMITED_SPACE.getType().equals(type);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyRiskLevelEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyRiskLevelEnum.java
new file mode 100644
index 0000000..676b413
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyRiskLevelEnum.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 椋庨櫓绛夌骇鏋氫妇
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyRiskLevelEnum {
+
+ LOW("LOW", "浣�"),
+ NORMAL("NORMAL", "涓�鑸�"),
+ HIGH("HIGH", "楂�"),
+ VERY_HIGH("VERY_HIGH", "鏋侀珮");
+
+ private final String level;
+ private final String name;
+
+ public static String getNameByLevel(String level) {
+ for (SafetyRiskLevelEnum value : values()) {
+ if (value.getLevel().equals(level)) {
+ return value.getName();
+ }
+ }
+ return level;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyTrainingTypeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyTrainingTypeEnum.java
new file mode 100644
index 0000000..71396c5
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyTrainingTypeEnum.java
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鍩硅绫诲瀷鏋氫妇
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyTrainingTypeEnum {
+
+ SAFETY("SAFETY", "瀹夊叏鍩硅"),
+ SKILL("SKILL", "鎶�鑳藉煿璁�"),
+ LAW("LAW", "娉曡瀹h疮"),
+ EMERGENCY("EMERGENCY", "搴旀�ユ紨缁冨煿璁�"),
+ INDUCTION("INDUCTION", "涓夌骇瀹夊叏鏁欒偛"),
+ OTHER("OTHER", "鍏朵粬");
+
+ private final String type;
+ private final String name;
+
+ public static String getNameByType(String type) {
+ for (SafetyTrainingTypeEnum value : values()) {
+ if (value.getType().equals(type)) {
+ return value.getName();
+ }
+ }
+ return type;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ledger/MesQcInspectionLedgerService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ledger/MesQcInspectionLedgerService.java
new file mode 100644
index 0000000..055f3a8
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ledger/MesQcInspectionLedgerService.java
@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.mes.service.qc.ledger;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo.MesQcInspectionLedgerPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo.MesQcInspectionLedgerRespVO;
+
+/**
+ * MES 妫�娴嬬粨鏋滃彴璐� Service 鎺ュ彛
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface MesQcInspectionLedgerService {
+
+ /**
+ * 鑾峰緱妫�娴嬬粨鏋滃彴璐﹀垎椤碉紙鍥涚被妫�楠屽崟缁熶竴鏌ヨ锛屼竴琛屼竴涓娴嬮」缁撴灉锛�
+ *
+ * @param pageReqVO 鍒嗛〉鏌ヨ
+ * @return 鍙拌处鍒嗛〉
+ */
+ PageResult<MesQcInspectionLedgerRespVO> getInspectionLedgerPage(MesQcInspectionLedgerPageReqVO pageReqVO);
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ledger/MesQcInspectionLedgerServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ledger/MesQcInspectionLedgerServiceImpl.java
new file mode 100644
index 0000000..8d94bf5
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ledger/MesQcInspectionLedgerServiceImpl.java
@@ -0,0 +1,75 @@
+package cn.iocoder.yudao.module.mes.service.qc.ledger;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo.MesQcInspectionLedgerPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo.MesQcInspectionLedgerRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcQualityExportVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.qc.ledger.MesQcInspectionLedgerMapper;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
+
+/**
+ * MES 妫�娴嬬粨鏋滃彴璐� Service 瀹炵幇绫�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class MesQcInspectionLedgerServiceImpl implements MesQcInspectionLedgerService {
+
+ @Resource
+ private MesQcInspectionLedgerMapper ledgerMapper;
+
+ @Resource
+ private MesMdItemService itemService;
+ @Resource
+ private MesMdUnitMeasureService unitMeasureService;
+ @Resource
+ private AdminUserApi adminUserApi;
+
+ @Override
+ public PageResult<MesQcInspectionLedgerRespVO> getInspectionLedgerPage(MesQcInspectionLedgerPageReqVO pageReqVO) {
+ // 鍒嗛〉鏌ヨ锛堝洓绫绘楠屽崟 UNION ALL锛�
+ IPage<MesQcInspectionLedgerRespVO> page = MyBatisUtils.buildPage(pageReqVO);
+ ledgerMapper.selectInspectionLedgerPage(page, pageReqVO);
+ List<MesQcInspectionLedgerRespVO> list = page.getRecords();
+ if (CollUtil.isEmpty(list)) {
+ return PageResult.empty(page.getTotal());
+ }
+ // 鎵归噺鏌ヨ鐗╂枡銆佽閲忓崟浣嶃�佹娴嬩汉鍛橈紝骞舵嫾瑁呭垽瀹氫緷鎹�
+ Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(convertSet(list, MesQcInspectionLedgerRespVO::getItemId));
+ Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
+ convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+ Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
+ convertSet(list, MesQcInspectionLedgerRespVO::getInspectorUserId));
+ for (MesQcInspectionLedgerRespVO vo : list) {
+ findAndThen(itemMap, vo.getItemId(), item -> {
+ vo.setItemCode(item.getCode());
+ vo.setItemName(item.getName());
+ vo.setItemSpecification(item.getSpecification());
+ findAndThen(unitMeasureMap, item.getUnitMeasureId(), unit -> vo.setUnitName(unit.getName()));
+ });
+ findAndThen(userMap, vo.getInspectorUserId(), user -> vo.setInspectorName(user.getNickname()));
+ vo.setJudgementBasis(MesQcQualityExportVO.buildRangeText(
+ vo.getStandardValue(), vo.getMinThreshold(), vo.getMaxThreshold()));
+ }
+ return new PageResult<>(list, page.getTotal());
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyCertificateService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyCertificateService.java
new file mode 100644
index 0000000..4c4ca18
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyCertificateService.java
@@ -0,0 +1,234 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.hrm.api.employee.HrmEmployeeApi;
+import cn.iocoder.yudao.module.hrm.api.employee.dto.HrmEmployeeSimpleDTO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert.SafetyCertificatePageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert.SafetyCertificateRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert.SafetyCertificateSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyCertificateDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyCertificateMapper;
+import cn.iocoder.yudao.module.mes.enums.safety.SafetyCertificateStatusEnum;
+import cn.iocoder.yudao.module.mes.enums.safety.SafetyCertificateTypeEnum;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.time.LocalDate;
+import java.time.temporal.ChronoUnit;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.SafetyErrorCodeConstants.*;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗圭浣滀笟璇佸彴璐� Service
+ *
+ * <p>鏍稿績鑳藉姏锛氳瘉涔﹀埌鏈熻嚜鍔ㄩ璀︺�傜姸鎬佺敱 {@link #resolveStatus} 鏍规嵁鏈夋晥鏈熷疄鏃舵帹瀵硷紝
+ * 涓嶄緷璧栨墜宸ョ淮鎶わ紝閬垮厤杩囨湡鏈強鏃舵洿鏂扮姸鎬併��</p>
+ *
+ * <p>鎸佽瘉浜洪�氳繃 employeeId 鍏宠仈浜哄姏璧勬簮鐨勫憳宸ユ。妗堬細
+ * 鏂板/淇敼鏃朵粠妗f甯﹀嚭濮撳悕銆佸伐鍙枫�侀儴闂ㄥ苟钀戒负蹇収锛涙煡璇㈡椂瀹炴椂鍥炲~鏈�鏂版。妗堜俊鎭紝
+ * 鍛樺伐璋冨矖鍚庤瘉浠跺垪琛ㄤ篃浼氳窡鐫�鏄剧ず鏂伴儴闂ㄣ��</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class SafetyCertificateService {
+
+ /** 榛樿鎻愬墠棰勮澶╂暟 */
+ public static final int DEFAULT_WARN_DAYS = 30;
+
+ @Resource
+ private SafetyCertificateMapper certificateMapper;
+ @Resource
+ private HrmEmployeeApi hrmEmployeeApi;
+ @Resource
+ private SafetyRefResolver refResolver;
+
+ public Long createCertificate(SafetyCertificateSaveReqVO reqVO) {
+ reqVO.setId(null);
+ validateCertificateForCreate(reqVO);
+ SafetyCertificateDO cert = buildCertificate(reqVO, null);
+ certificateMapper.insert(cert);
+ return cert.getId();
+ }
+
+ public void updateCertificate(SafetyCertificateSaveReqVO reqVO) {
+ SafetyCertificateDO old = validateCertificateExists(reqVO.getId());
+ validateCertificateForUpdate(reqVO, old);
+ SafetyCertificateDO cert = buildCertificate(reqVO, old);
+ certificateMapper.updateById(cert);
+ }
+
+ public void deleteCertificate(Long id) {
+ validateCertificateExists(id);
+ certificateMapper.deleteById(id);
+ }
+
+ public SafetyCertificateDO getCertificate(Long id) {
+ return validateCertificateExists(id);
+ }
+
+ public PageResult<SafetyCertificateDO> getCertificatePage(SafetyCertificatePageReqVO reqVO) {
+ return certificateMapper.selectPage(reqVO);
+ }
+
+ /**
+ * 鏌ヨ鍗冲皢鍒版湡 / 宸茶繃鏈熺殑璇佷欢鍒楄〃
+ *
+ * @param days 鎻愬墠棰勮澶╂暟锛屼负绌轰娇鐢ㄩ粯璁� 30 澶�
+ */
+ public List<SafetyCertificateDO> getExpiringCertificates(Integer days) {
+ int warnDays = days == null || days <= 0 ? DEFAULT_WARN_DAYS : days;
+ return certificateMapper.selectExpiringBefore(LocalDate.now().plusDays(warnDays));
+ }
+
+ /**
+ * 鎵归噺琛ュ叏鎸佽瘉浜虹殑鏈�鏂板憳宸ユ。妗堜俊鎭紙濮撳悕銆佸伐鍙枫�侀儴闂ㄣ�佹墜鏈恒�佸叧鑱旂敤鎴凤級
+ *
+ * <p>鏌ヨ鏃剁敤妗f瀹炴椂鍊艰鐩栧揩鐓у�硷紝淇濊瘉鍛樺伐璋冨矖鍚庡彴璐﹀悓姝ワ紱
+ * 鍛樺伐妗f宸茶鍒犻櫎鏃跺洖閫�鍒板揩鐓у�硷紝淇濊瘉鍘嗗彶璇佷欢浠嶅彲灞曠ず銆�</p>
+ */
+ public void fillEmployeeInfo(List<SafetyCertificateDO> certs) {
+ List<Long> employeeIds = certs.stream()
+ .map(SafetyCertificateDO::getEmployeeId)
+ .filter(Objects::nonNull).distinct().toList();
+ // 鐢� new HashMap<>() 鑰岄潪 Map.of()锛歟mployeeId 鍏佽涓� null锛�
+ // 鍚庨潰 employeeMap.get(cert.getEmployeeId()) 鍦ㄧ┖闆嗗悎鍦烘櫙浼� get(null)锛�
+ // Map.of() 鐨� get(null) 浼氭姏 NPE 瀵艰嚧璇佷欢鍒楄〃鎺ュ彛 500銆�
+ Map<Long, HrmEmployeeSimpleDTO> employeeMap = employeeIds.isEmpty() ? new HashMap<>()
+ : hrmEmployeeApi.getEmployeeList(employeeIds).stream()
+ .collect(Collectors.toMap(HrmEmployeeSimpleDTO::getId, e -> e, (a, b) -> a));
+ certs.forEach(cert -> {
+ HrmEmployeeSimpleDTO employee = employeeMap.get(cert.getEmployeeId());
+ if (employee != null) {
+ cert.setEmployeeName(employee.getName());
+ cert.setEmployeeNo(employee.getEmployeeNo());
+ cert.setDeptName(employee.getDeptName());
+ }
+ });
+ }
+
+ /**
+ * 鎵归噺琛ュ叏灞曠ず瀛楁锛屾寔璇佷汉妗f涓�娆℃�ф煡濂斤紝閬垮厤閫愭潯鏌ヨ
+ */
+ public void fillDisplayFieldsBatch(List<SafetyCertificateDO> certs, List<SafetyCertificateRespVO> resps) {
+ var employeeMap = refResolver.employeeMap(certs.stream().map(SafetyCertificateDO::getEmployeeId).toList());
+ for (int i = 0; i < certs.size(); i++) {
+ fillDisplayFields(certs.get(i), resps.get(i), employeeMap.get(certs.get(i).getEmployeeId()));
+ }
+ }
+
+ /**
+ * 鍗曚釜璇佷欢鐨勫睍绀哄瓧娈佃ˉ鍏紙绫诲瀷鍚嶇О銆佺姸鎬佸悕绉般�佸墿浣欏ぉ鏁般�佹寔璇佷汉妗f锛�
+ */
+ public void fillDisplayFields(SafetyCertificateDO cert, SafetyCertificateRespVO respVO) {
+ fillDisplayFields(cert, respVO, cert.getEmployeeId() == null ? null
+ : hrmEmployeeApi.getEmployee(cert.getEmployeeId()));
+ }
+
+ private void fillDisplayFields(SafetyCertificateDO cert, SafetyCertificateRespVO respVO,
+ HrmEmployeeSimpleDTO employee) {
+ respVO.setCertTypeName(SafetyCertificateTypeEnum.getNameByType(cert.getCertType()));
+ String status = resolveStatus(cert.getExpireDate(), cert.getWarnDays(), cert.getStatus());
+ respVO.setStatus(status);
+ respVO.setStatusName(SafetyCertificateStatusEnum.getNameByStatus(status));
+ if (cert.getExpireDate() != null) {
+ respVO.setRemainingDays(ChronoUnit.DAYS.between(LocalDate.now(), cert.getExpireDate()));
+ }
+ if (employee != null) {
+ respVO.setEmployeeName(employee.getName());
+ respVO.setEmployeeNo(employee.getEmployeeNo());
+ respVO.setDeptName(employee.getDeptName());
+ respVO.setPhone(employee.getPhone());
+ respVO.setUserId(employee.getUserId());
+ }
+ }
+
+ /**
+ * 鏍规嵁鏈夋晥鏈熸帹瀵肩姸鎬侊細宸叉敞閿�淇濇寔涓嶅彉锛涜繃鏈� 鈫� EXPIRED锛涘湪棰勮鏈熷唴 鈫� EXPIRING锛涘惁鍒� VALID
+ *
+ * @param expireDate 鏈夋晥鏈�
+ * @param warnDays 鎻愬墠棰勮澶╂暟
+ * @param current 褰撳墠鐘舵�侊紝鐢ㄤ簬淇濇姢 REVOKED
+ */
+ public static String resolveStatus(LocalDate expireDate, Integer warnDays, String current) {
+ if (SafetyCertificateStatusEnum.REVOKED.getStatus().equals(current)) {
+ return SafetyCertificateStatusEnum.REVOKED.getStatus();
+ }
+ if (expireDate == null) {
+ return SafetyCertificateStatusEnum.VALID.getStatus();
+ }
+ LocalDate today = LocalDate.now();
+ if (expireDate.isBefore(today)) {
+ return SafetyCertificateStatusEnum.EXPIRED.getStatus();
+ }
+ int days = warnDays == null || warnDays <= 0 ? DEFAULT_WARN_DAYS : warnDays;
+ if (!expireDate.isAfter(today.plusDays(days))) {
+ return SafetyCertificateStatusEnum.EXPIRING.getStatus();
+ }
+ return SafetyCertificateStatusEnum.VALID.getStatus();
+ }
+
+ /**
+ * 鏋勫缓 DO锛氭寔璇佷汉濮撳悕/宸ュ彿/閮ㄩ棬浠庡憳宸ユ。妗堝甫鍑哄苟钀戒负蹇収
+ */
+ private SafetyCertificateDO buildCertificate(SafetyCertificateSaveReqVO reqVO, SafetyCertificateDO old) {
+ HrmEmployeeSimpleDTO employee = hrmEmployeeApi.getEmployee(reqVO.getEmployeeId());
+ if (employee == null) {
+ throw exception(SAFETY_CERT_EMPLOYEE_NOT_EXISTS);
+ }
+ SafetyCertificateDO cert = BeanUtils.toBean(reqVO, SafetyCertificateDO.class);
+ cert.setEmployeeId(employee.getId());
+ cert.setEmployeeName(employee.getName());
+ cert.setEmployeeNo(employee.getEmployeeNo());
+ cert.setDeptName(employee.getDeptName());
+ cert.setCertNo(StrUtil.trim(reqVO.getCertNo()));
+ cert.setWarnDays(reqVO.getWarnDays() == null ? DEFAULT_WARN_DAYS : reqVO.getWarnDays());
+ // 宸叉敞閿�鐘舵�佷笉鍏佽閫氳繃缂栬緫鏀瑰洖
+ String currentStatus = old == null ? reqVO.getStatus() : old.getStatus();
+ cert.setStatus(resolveStatus(reqVO.getExpireDate(), cert.getWarnDays(), currentStatus));
+ cert.setRemark(reqVO.getRemark() == null ? "" : reqVO.getRemark().trim());
+ return cert;
+ }
+
+ private void validateCertificateForCreate(SafetyCertificateSaveReqVO reqVO) {
+ validateExpireAfterIssue(reqVO);
+ if (certificateMapper.selectByCertNo(StrUtil.trim(reqVO.getCertNo())) != null) {
+ throw exception(SAFETY_CERT_NO_DUPLICATE);
+ }
+ }
+
+ private void validateCertificateForUpdate(SafetyCertificateSaveReqVO reqVO, SafetyCertificateDO old) {
+ validateExpireAfterIssue(reqVO);
+ SafetyCertificateDO byCertNo = certificateMapper.selectByCertNo(StrUtil.trim(reqVO.getCertNo()));
+ if (byCertNo != null && !byCertNo.getId().equals(old.getId())) {
+ throw exception(SAFETY_CERT_NO_DUPLICATE);
+ }
+ }
+
+ private void validateExpireAfterIssue(SafetyCertificateSaveReqVO reqVO) {
+ if (reqVO.getIssueDate() != null && reqVO.getExpireDate() != null
+ && !Objects.requireNonNull(reqVO.getExpireDate()).isAfter(reqVO.getIssueDate())) {
+ throw exception(SAFETY_CERT_EXPIRE_BEFORE_ISSUE);
+ }
+ }
+
+ private SafetyCertificateDO validateCertificateExists(Long id) {
+ SafetyCertificateDO cert = id == null ? null : certificateMapper.selectById(id);
+ if (cert == null) {
+ throw exception(SAFETY_CERT_NOT_EXISTS);
+ }
+ return cert;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyFileService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyFileService.java
new file mode 100644
index 0000000..e1724a9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyFileService.java
@@ -0,0 +1,99 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.module.infra.api.file.FileApi;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 绉诲姩绔檮浠朵笂浼� Service
+ *
+ * <p>宸℃銆侀殣鎮c�佷綔涓氱エ銆佹紨缁冪瓑鐜妭鐨勭幇鍦烘媿鐓х粺涓�璧拌繖閲岋細
+ * 钀藉埌 infra 鏂囦欢瀛樺偍锛岃繑鍥炲彲璁块棶 URL锛屽涓檮浠堕�楀彿鎷兼帴鍚庡瓨鍏ヤ笟鍔¤〃銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Slf4j
+public class SafetyFileService {
+
+ /** 鍗曚釜鏂囦欢鏈�澶� 20MB锛屾墜鏈哄師鍥捐鍒囧悗瓒冲 */
+ private static final long MAX_SIZE = 20L * 1024 * 1024;
+ /** 鍏佽鐨勫浘鐗囩被鍨� */
+ private static final List<String> ALLOWED_EXT = List.of(
+ "jpg", "jpeg", "png", "webp", "heic", "gif", "bmp", "pdf", "doc", "docx", "xls", "xlsx");
+
+ @Resource
+ private FileApi fileApi;
+
+ /**
+ * 涓婁紶鍗曚釜鏂囦欢
+ *
+ * @param file 鏂囦欢
+ * @param bizType 涓氬姟绫诲瀷锛坰afety/inspection銆乻afety/hazard 绛夛級锛岀敤浣滃瓨鍌ㄧ洰褰�
+ * @return 鏂囦欢璁块棶 URL
+ */
+ public String upload(MultipartFile file, String bizType) {
+ if (file == null || file.isEmpty()) {
+ throw new IllegalArgumentException("涓婁紶鏂囦欢涓嶈兘涓虹┖");
+ }
+ if (file.getSize() > MAX_SIZE) {
+ throw new IllegalArgumentException("鍗曚釜鏂囦欢涓嶈兘瓒呰繃 20MB");
+ }
+ String originalName = StrUtil.blankToDefault(file.getOriginalFilename(), "photo.jpg");
+ String ext = StrUtil.subAfter(originalName, ".", true).toLowerCase();
+ if (StrUtil.isNotBlank(ext) && !ALLOWED_EXT.contains(ext)) {
+ throw new IllegalArgumentException("涓嶆敮鎸佺殑鏂囦欢绫诲瀷锛�" + ext);
+ }
+ byte[] content;
+ try {
+ content = IoUtil.readBytes(file.getInputStream());
+ } catch (IOException e) {
+ throw new IllegalStateException("璇诲彇涓婁紶鏂囦欢澶辫触", e);
+ }
+ String directory = StrUtil.blankToDefault(bizType, "safety") + "/" + java.time.LocalDate.now();
+ return fileApi.createFile(content, originalName, directory, file.getContentType());
+ }
+
+ /**
+ * 鎵归噺涓婁紶锛堢Щ鍔ㄧ涓�娆℃媿澶氬紶锛�
+ *
+ * @return 鏂囦欢 URL 鍒楄〃
+ */
+ public List<String> uploadBatch(List<MultipartFile> files, String bizType) {
+ if (files == null || files.isEmpty()) {
+ return List.of();
+ }
+ if (files.size() > 9) {
+ throw new IllegalArgumentException("鍗曟鏈�澶氫笂浼� 9 寮�");
+ }
+ List<String> urls = new ArrayList<>();
+ for (MultipartFile file : files) {
+ urls.add(upload(file, bizType));
+ }
+ return urls;
+ }
+
+ /**
+ * 鍒犻櫎闄勪欢锛堜粠閫楀彿涓查噷鍓旈櫎鏌愪釜 URL锛�
+ */
+ public String removeUrl(String urls, String target) {
+ if (StrUtil.isBlank(urls) || StrUtil.isBlank(target)) {
+ return urls;
+ }
+ return Arrays.stream(urls.split(","))
+ .map(String::trim)
+ .filter(url -> !url.equals(target.trim()))
+ .reduce((a, b) -> a + "," + b)
+ .orElse("");
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardService.java
new file mode 100644
index 0000000..255d851
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardService.java
@@ -0,0 +1,220 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyHazardDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyHazardMapper;
+import cn.iocoder.yudao.module.mes.enums.safety.SafetyHazardLevelEnum;
+import cn.iocoder.yudao.module.mes.enums.safety.SafetyHazardSourceEnum;
+import cn.iocoder.yudao.module.mes.enums.safety.SafetyHazardStatusEnum;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.SafetyErrorCodeConstants.*;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅鐧昏涓庨棴鐜� Service
+ *
+ * <p>瀹屾暣闂幆锛氫笂鎶� 鈫� 鍒嗘淳 鈫� 鏁存敼 鈫� 澶嶆煡锛堥�氳繃鍒欓棴鐜紝涓嶉�氳繃閫�鍥炴暣鏀癸級銆�
+ * 姣忎釜鐜妭閮芥牎楠屽綋鍓嶇姸鎬侊紝闃叉璺虫鎴栭噸澶嶆搷浣溿��</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class SafetyHazardService {
+
+ private static final DateTimeFormatter CODE_DATE = DateTimeFormatter.ofPattern("yyyyMMdd");
+
+ @Resource
+ private SafetyHazardMapper hazardMapper;
+ @Resource
+ private SafetyRefResolver refResolver;
+
+ /**
+ * 闅愭偅涓婃姤锛堝惈绉诲姩绔媿鐓т笂浼犵殑 photoUrls锛�
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public Long createHazard(SafetyHazardSaveReqVO reqVO) {
+ reqVO.setId(null);
+ SafetyHazardDO hazard = BeanUtils.toBean(reqVO, SafetyHazardDO.class);
+ hazard.setCode(hazardMapper.selectNextCode("HZ" + LocalDate.now().format(CODE_DATE)));
+ hazard.setTitle(StrUtil.trim(reqVO.getTitle()));
+ hazard.setReporterId(reqVO.getReporterId());
+ hazard.setReporter(refResolver.requireEmployee(reqVO.getReporterId(), SAFETY_EMPLOYEE_REQUIRED).getName());
+ hazard.setLevel(StrUtil.blankToDefault(reqVO.getLevel(), SafetyHazardLevelEnum.GENERAL.getLevel()));
+ hazard.setSource(StrUtil.blankToDefault(reqVO.getSource(), SafetyHazardSourceEnum.SELF_CHECK.getSource()));
+ hazard.setReportTime(reqVO.getReportTime() == null ? LocalDateTime.now() : reqVO.getReportTime());
+ hazard.setStatus(SafetyHazardStatusEnum.REPORTED.getStatus());
+ hazard.setRemark(reqVO.getRemark() == null ? "" : reqVO.getRemark().trim());
+ hazardMapper.insert(hazard);
+ return hazard.getId();
+ }
+
+ /**
+ * 淇敼闅愭偅鍩虹淇℃伅锛堜粎鏈垎娲惧墠鍏佽鏀瑰叧閿瓧娈碉級
+ */
+ public void updateHazard(SafetyHazardSaveReqVO reqVO) {
+ SafetyHazardDO old = validateHazardExists(reqVO.getId());
+ if (!SafetyHazardStatusEnum.REPORTED.getStatus().equals(old.getStatus())
+ && !SafetyHazardStatusEnum.ASSIGNED.getStatus().equals(old.getStatus())) {
+ throw exception(SAFETY_HAZARD_STATUS_ERROR);
+ }
+ SafetyHazardDO update = BeanUtils.toBean(reqVO, SafetyHazardDO.class);
+ // 缂栧彿涓庣姸鎬佷笉鍏佽閫氳繃鏅�氱紪杈戜慨鏀�
+ update.setCode(null);
+ update.setStatus(null);
+ hazardMapper.updateById(update);
+ }
+
+ /**
+ * 鍒嗘淳鏁存敼璐d换浜�
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void assignHazard(SafetyHazardAssignReqVO reqVO) {
+ SafetyHazardDO hazard = validateHazardExists(reqVO.getId());
+ if (!SafetyHazardStatusEnum.REPORTED.getStatus().equals(hazard.getStatus())
+ && !SafetyHazardStatusEnum.REJECTED.getStatus().equals(hazard.getStatus())) {
+ throw exception(SAFETY_HAZARD_STATUS_ERROR);
+ }
+ if (reqVO.getAssigneeId() == null) {
+ throw exception(SAFETY_HAZARD_ASSIGNEE_REQUIRED);
+ }
+ var assignee = refResolver.requireEmployee(reqVO.getAssigneeId(), SAFETY_HAZARD_ASSIGNEE_REQUIRED);
+ SafetyHazardDO update = new SafetyHazardDO();
+ update.setId(hazard.getId());
+ update.setAssigneeId(assignee.getId());
+ update.setAssignee(assignee.getName());
+ update.setAssignTime(LocalDateTime.now());
+ update.setRectifyDeadline(reqVO.getRectifyDeadline());
+ update.setStatus(SafetyHazardStatusEnum.RECTIFYING.getStatus());
+ if (StrUtil.isNotBlank(reqVO.getRemark())) {
+ update.setRemark(reqVO.getRemark().trim());
+ }
+ hazardMapper.updateById(update);
+ }
+
+ /**
+ * 鎻愪氦鏁存敼缁撴灉
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void rectifyHazard(SafetyHazardRectifyReqVO reqVO) {
+ SafetyHazardDO hazard = validateHazardExists(reqVO.getId());
+ if (!SafetyHazardStatusEnum.RECTIFYING.getStatus().equals(hazard.getStatus())
+ && !SafetyHazardStatusEnum.REJECTED.getStatus().equals(hazard.getStatus())) {
+ throw exception(SAFETY_HAZARD_STATUS_ERROR);
+ }
+ SafetyHazardDO update = new SafetyHazardDO();
+ update.setId(hazard.getId());
+ update.setRectifyDesc(reqVO.getRectifyDesc().trim());
+ update.setRectifyPhotoUrls(reqVO.getRectifyPhotoUrls());
+ update.setRectifyTime(LocalDateTime.now());
+ update.setStatus(SafetyHazardStatusEnum.RECHECKING.getStatus());
+ hazardMapper.updateById(update);
+ }
+
+ /**
+ * 澶嶆煡锛氶�氳繃鍒欓棴鐜紝涓嶉�氳繃閫�鍥炴暣鏀广��
+ *
+ * <p>鏍¢獙鏁存敼浜轰笌澶嶆煡浜轰笉鑳芥槸鍚屼竴浜猴紝淇濊瘉闂幆鐨勪袱绾у垎绂汇��</p>
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void recheckHazard(SafetyHazardRecheckReqVO reqVO) {
+ SafetyHazardDO hazard = validateHazardExists(reqVO.getId());
+ if (!SafetyHazardStatusEnum.RECHECKING.getStatus().equals(hazard.getStatus())) {
+ throw exception(SAFETY_HAZARD_STATUS_ERROR);
+ }
+ var rechecker = refResolver.requireEmployee(reqVO.getRecheckerId(), SAFETY_EMPLOYEE_REQUIRED);
+ // 鐢ㄥ憳宸ョ紪鍙锋瘮杈冿紝姣斿鍚嶆瘮杈冨彲闈狅紙鍚屽悕涓嶅悓浜� / 鏀瑰悕閮戒笉浼氳鍒わ級
+ if (hazard.getAssigneeId() != null && hazard.getAssigneeId().equals(rechecker.getId())) {
+ throw exception(SAFETY_HAZARD_SAME_OPERATOR);
+ }
+ boolean passed = "PASSED".equals(reqVO.getRecheckResult());
+ SafetyHazardDO update = new SafetyHazardDO();
+ update.setId(hazard.getId());
+ update.setRecheckerId(rechecker.getId());
+ update.setRechecker(rechecker.getName());
+ update.setRecheckTime(LocalDateTime.now());
+ update.setRecheckResult(reqVO.getRecheckResult());
+ update.setRecheckRemark(reqVO.getRecheckRemark());
+ if (passed) {
+ update.setStatus(SafetyHazardStatusEnum.CLOSED.getStatus());
+ update.setCloseTime(LocalDateTime.now());
+ } else {
+ update.setStatus(SafetyHazardStatusEnum.REJECTED.getStatus());
+ }
+ hazardMapper.updateById(update);
+ }
+
+ public void deleteHazard(Long id) {
+ validateHazardExists(id);
+ hazardMapper.deleteById(id);
+ }
+
+ public SafetyHazardDO getHazard(Long id) {
+ return validateHazardExists(id);
+ }
+
+ public PageResult<SafetyHazardDO> getHazardPage(SafetyHazardPageReqVO reqVO) {
+ reqVO.normalizeTimeRange();
+ return hazardMapper.selectPage(reqVO);
+ }
+
+ /**
+ * 鎵归噺鍥炲~涓婃姤浜� / 鏁存敼璐d换浜� / 澶嶆煡浜虹殑鏈�鏂板鍚�
+ */
+ public void fillPersonNames(List<SafetyHazardDO> hazards) {
+ if (CollUtil.isEmpty(hazards)) {
+ return;
+ }
+ var ids = new java.util.ArrayList<Long>(hazards.size() * 3);
+ hazards.forEach(h -> { ids.add(h.getReporterId()); ids.add(h.getAssigneeId()); ids.add(h.getRecheckerId()); });
+ var employeeMap = refResolver.employeeMap(ids);
+ hazards.forEach(hazard -> {
+ var reporter = employeeMap.get(hazard.getReporterId());
+ if (reporter != null) hazard.setReporter(reporter.getName());
+ var assignee = employeeMap.get(hazard.getAssigneeId());
+ if (assignee != null) hazard.setAssignee(assignee.getName());
+ var rechecker = employeeMap.get(hazard.getRecheckerId());
+ if (rechecker != null) hazard.setRechecker(rechecker.getName());
+ });
+ }
+
+ /**
+ * 灞曠ず瀛楁琛ュ叏锛堢瓑绾�/鏉ユ簮/鐘舵�佸悕绉般�佽秴鏈熸爣璁帮級
+ */
+ public static void fillHazardDisplay(SafetyHazardDO hazard, SafetyHazardRespVO respVO) {
+ respVO.setLevelName(SafetyHazardLevelEnum.getNameByLevel(hazard.getLevel()));
+ respVO.setSourceName(SafetyHazardSourceEnum.getNameBySource(hazard.getSource()));
+ respVO.setStatusName(SafetyHazardStatusEnum.getNameByStatus(hazard.getStatus()));
+ respVO.setRecheckResultName(switch (StrUtil.blankToDefault(hazard.getRecheckResult(), "")) {
+ case "PASSED" -> "閫氳繃";
+ case "REJECTED" -> "涓嶉�氳繃";
+ default -> "";
+ });
+ boolean overdue = hazard.getRectifyDeadline() != null
+ && hazard.getRectifyDeadline().isBefore(LocalDate.now())
+ && !SafetyHazardStatusEnum.isFinished(hazard.getStatus());
+ respVO.setOverdue(overdue);
+ }
+
+ private SafetyHazardDO validateHazardExists(Long id) {
+ SafetyHazardDO hazard = id == null ? null : hazardMapper.selectById(id);
+ if (hazard == null) {
+ throw exception(SAFETY_HAZARD_NOT_EXISTS);
+ }
+ return hazard;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyInspectionService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyInspectionService.java
new file mode 100644
index 0000000..aa4df41
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyInspectionService.java
@@ -0,0 +1,223 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.inspection.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyInspectionDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyInspectionPointDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyInspectionMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyInspectionPointMapper;
+import cn.iocoder.yudao.module.mes.enums.safety.SafetyInspectCycleEnum;
+import cn.iocoder.yudao.module.mes.enums.safety.SafetyInspectionPointTypeEnum;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.SafetyErrorCodeConstants.*;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃鐐逛綅涓庡贰妫�璁板綍 Service
+ *
+ * <p>瑕嗙洊楂樺帇閰嶇數瀹ゃ�佹満缁勫尯绛夋棩甯稿畨鍏ㄥ贰妫�銆傚贰妫�鍙戠幇寮傚父鏃跺彲鐩存帴杞殣鎮d笂鎶ャ��</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class SafetyInspectionService {
+
+ @Resource
+ private SafetyInspectionPointMapper pointMapper;
+ @Resource
+ private SafetyInspectionMapper inspectionMapper;
+ @Resource
+ private SafetyRefResolver refResolver;
+
+ // ==================== 宸℃鐐逛綅 ====================
+
+ public Long createPoint(SafetyInspectionPointSaveReqVO reqVO) {
+ reqVO.setId(null);
+ String code = StrUtil.trim(reqVO.getCode());
+ if (pointMapper.selectByCode(code) != null) {
+ throw exception(SAFETY_POINT_CODE_DUPLICATE);
+ }
+ SafetyInspectionPointDO point = BeanUtils.toBean(reqVO, SafetyInspectionPointDO.class);
+ point.setCode(code);
+ point.setName(StrUtil.trim(reqVO.getName()));
+ point.setInspectCycle(StrUtil.blankToDefault(reqVO.getInspectCycle(), SafetyInspectCycleEnum.DAILY.getCycle()));
+ applyPointRefs(point, reqVO.getWorkshopId(), reqVO.getOwnerId());
+ pointMapper.insert(point);
+ return point.getId();
+ }
+
+ public void updatePoint(SafetyInspectionPointSaveReqVO reqVO) {
+ SafetyInspectionPointDO old = validatePointExists(reqVO.getId());
+ String code = StrUtil.trim(reqVO.getCode());
+ SafetyInspectionPointDO byCode = pointMapper.selectByCode(code);
+ if (byCode != null && !byCode.getId().equals(old.getId())) {
+ throw exception(SAFETY_POINT_CODE_DUPLICATE);
+ }
+ SafetyInspectionPointDO point = BeanUtils.toBean(reqVO, SafetyInspectionPointDO.class);
+ point.setCode(code);
+ point.setName(StrUtil.trim(reqVO.getName()));
+ applyPointRefs(point, reqVO.getWorkshopId(), reqVO.getOwnerId());
+ pointMapper.updateById(point);
+ }
+
+ public void deletePoint(Long id) {
+ validatePointExists(id);
+ pointMapper.deleteById(id);
+ }
+
+ public SafetyInspectionPointDO getPoint(Long id) {
+ return validatePointExists(id);
+ }
+
+ public PageResult<SafetyInspectionPointDO> getPointPage(SafetyInspectionPointPageReqVO reqVO) {
+ return pointMapper.selectPage(reqVO);
+ }
+
+ /**
+ * 鍚敤涓殑宸℃鐐逛綅鍒楄〃锛堢Щ鍔ㄧ宸℃閫夋嫨鐢級
+ */
+ public List<SafetyInspectionPointDO> getEnabledPointList() {
+ return pointMapper.selectListByStatus(0);
+ }
+
+ /**
+ * 鐐逛綅鐨勪富鏁版嵁寮曠敤锛氳溅闂� + 璐d换浜猴紝浠庝富鏁版嵁甯﹀嚭鍚嶇О钀藉揩鐓�
+ */
+ private void applyPointRefs(SafetyInspectionPointDO point, Long workshopId, Long ownerId) {
+ point.setWorkshopId(workshopId);
+ if (workshopId == null) {
+ point.setWorkshopName("");
+ } else {
+ point.setWorkshopName(refResolver.requireWorkshop(workshopId).getName());
+ }
+ point.setOwnerId(ownerId);
+ if (ownerId == null) {
+ point.setOwnerName("");
+ } else {
+ point.setOwnerName(refResolver.requireEmployee(ownerId, SAFETY_EMPLOYEE_REQUIRED).getName());
+ }
+ }
+
+ /**
+ * 鎵归噺鍥炲~鐐逛綅鐨勮溅闂村悕涓庤矗浠讳汉濮撳悕锛堢敤涓绘暟鎹渶鏂板�艰鐩栧揩鐓э級
+ */
+ public void fillPointRefs(List<SafetyInspectionPointDO> points) {
+ if (CollUtil.isEmpty(points)) {
+ return;
+ }
+ var workshopMap = refResolver.workshopMap(points.stream().map(SafetyInspectionPointDO::getWorkshopId).toList());
+ var employeeMap = refResolver.employeeMap(points.stream().map(SafetyInspectionPointDO::getOwnerId).toList());
+ points.forEach(point -> {
+ var workshop = workshopMap.get(point.getWorkshopId());
+ if (workshop != null) {
+ point.setWorkshopName(workshop.getName());
+ }
+ var employee = employeeMap.get(point.getOwnerId());
+ if (employee != null) {
+ point.setOwnerName(employee.getName());
+ }
+ });
+ }
+
+ public static void fillPointDisplay(SafetyInspectionPointDO point, SafetyInspectionPointRespVO respVO) {
+ respVO.setPointTypeName(SafetyInspectionPointTypeEnum.getNameByType(point.getPointType()));
+ respVO.setInspectCycleName(SafetyInspectCycleEnum.getNameByCycle(point.getInspectCycle()));
+ }
+
+ // ==================== 宸℃璁板綍 ====================
+
+ public Long createInspection(SafetyInspectionSaveReqVO reqVO) {
+ reqVO.setId(null);
+ SafetyInspectionPointDO point = validatePointExists(reqVO.getPointId());
+ if (Integer.valueOf(1).equals(point.getStatus())) {
+ throw exception(SAFETY_POINT_DISABLED);
+ }
+ SafetyInspectionDO inspection = buildInspection(reqVO, point);
+ inspectionMapper.insert(inspection);
+ return inspection.getId();
+ }
+
+ public void updateInspection(SafetyInspectionSaveReqVO reqVO) {
+ SafetyInspectionDO old = validateInspectionExists(reqVO.getId());
+ SafetyInspectionPointDO point = validatePointExists(reqVO.getPointId());
+ SafetyInspectionDO inspection = buildInspection(reqVO, point);
+ inspection.setId(old.getId());
+ inspectionMapper.updateById(inspection);
+ }
+
+ public void deleteInspection(Long id) {
+ validateInspectionExists(id);
+ inspectionMapper.deleteById(id);
+ }
+
+ public SafetyInspectionDO getInspection(Long id) {
+ return validateInspectionExists(id);
+ }
+
+ public PageResult<SafetyInspectionDO> getInspectionPage(SafetyInspectionPageReqVO reqVO) {
+ return inspectionMapper.selectPage(reqVO);
+ }
+
+ private SafetyInspectionDO buildInspection(SafetyInspectionSaveReqVO reqVO, SafetyInspectionPointDO point) {
+ SafetyInspectionDO inspection = BeanUtils.toBean(reqVO, SafetyInspectionDO.class);
+ inspection.setPointId(point.getId());
+ inspection.setPointName(point.getName());
+ inspection.setPointType(point.getPointType());
+ inspection.setInspectorId(reqVO.getInspectorId());
+ inspection.setInspector(refResolver.requireEmployee(reqVO.getInspectorId(), SAFETY_EMPLOYEE_REQUIRED).getName());
+ inspection.setResult(StrUtil.blankToDefault(reqVO.getResult(), "NORMAL"));
+ inspection.setInspectTime(reqVO.getInspectTime() == null ? LocalDateTime.now() : reqVO.getInspectTime());
+ inspection.setHazardCount(reqVO.getHazardCount() == null ? 0 : reqVO.getHazardCount());
+ inspection.setRemark(reqVO.getRemark() == null ? "" : reqVO.getRemark().trim());
+ return inspection;
+ }
+
+ /**
+ * 鎵归噺鍥炲~宸℃浜烘渶鏂板鍚�
+ */
+ public void fillInspectorNames(List<SafetyInspectionDO> records) {
+ if (CollUtil.isEmpty(records)) {
+ return;
+ }
+ var employeeMap = refResolver.employeeMap(records.stream().map(SafetyInspectionDO::getInspectorId).toList());
+ records.forEach(record -> {
+ var employee = employeeMap.get(record.getInspectorId());
+ if (employee != null) {
+ record.setInspector(employee.getName());
+ }
+ });
+ }
+
+ /** 鏈�杩戜竴娆″贰妫�鏃堕棿锛堢敤浜庣偣浣嶅垪琛ㄥ睍绀猴級 */
+ public LocalDateTime getLastInspectTime(Long pointId) {
+ SafetyInspectionDO latest = inspectionMapper.selectLatestByPointId(pointId);
+ return latest == null ? null : latest.getInspectTime();
+ }
+
+ private SafetyInspectionPointDO validatePointExists(Long id) {
+ SafetyInspectionPointDO point = id == null ? null : pointMapper.selectById(id);
+ if (point == null) {
+ throw exception(SAFETY_POINT_NOT_EXISTS);
+ }
+ return point;
+ }
+
+ private SafetyInspectionDO validateInspectionExists(Long id) {
+ SafetyInspectionDO inspection = id == null ? null : inspectionMapper.selectById(id);
+ if (inspection == null) {
+ throw exception(SAFETY_INSPECTION_NOT_EXISTS);
+ }
+ return inspection;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyLedgerExportService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyLedgerExportService.java
new file mode 100644
index 0000000..dea71a1
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyLedgerExportService.java
@@ -0,0 +1,334 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.idev.excel.FastExcelFactory;
+import cn.iocoder.yudao.framework.common.util.http.HttpUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ledger.SafetyLedgerExportReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.*;
+import cn.iocoder.yudao.module.mes.enums.safety.*;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.SafetyErrorCodeConstants.SAFETY_LEDGER_DATE_RANGE_INVALID;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐢靛姏琛屼笟鏍囧噯鍖栧彴璐﹀鍑� Service
+ *
+ * <p>鎸夈�屽叏濂椼�嶅鍑烘椂涓�娆$敓鎴愬 Sheet 宸ヤ綔绨匡紝瑕嗙洊瀹夊叏鏍囧噯鍖栨鏌ユ墍闇�鐨勫叏閮ㄥ彴璐︼細
+ * 缁勭粐鏋舵瀯銆佺壒绉嶄綔涓氳瘉銆佸贰妫�璁板綍銆侀殣鎮e彴璐︺�佷綔涓氱エ銆佺洃鎶よ褰曘�佺墿璧勫彴璐︺��
+ * 鍑哄叆搴撴祦姘淬�佸煿璁褰曘�佹紨缁冭褰曘�佷簨鏁呯櫥璁般��</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+public class SafetyLedgerExportService {
+
+ @Resource
+ private SafetyOrgService orgService;
+ @Resource
+ private SafetyCertificateService certificateService;
+ @Resource
+ private SafetyInspectionService inspectionService;
+ @Resource
+ private SafetyHazardService hazardService;
+ @Resource
+ private SafetyWorkPermitService permitService;
+ @Resource
+ private SafetyMaterialService materialService;
+ @Resource
+ private SafetyTrainingService trainingService;
+
+ /**
+ * 瀵煎嚭鏍囧噯鍖栧彴璐�
+ */
+ public void export(SafetyLedgerExportReqVO reqVO, HttpServletResponse response) throws IOException {
+ LocalDate start = reqVO.getStartDate();
+ LocalDate end = reqVO.getEndDate();
+ if (start != null && end != null && start.isAfter(end)) {
+ throw exception(SAFETY_LEDGER_DATE_RANGE_INVALID);
+ }
+ String type = reqVO.getType() == null ? "ALL" : reqVO.getType();
+ List<Sheet> sheets = new ArrayList<>();
+ if ("ALL".equals(type) || "CERT".equals(type)) {
+ sheets.add(certSheet());
+ }
+ if ("ALL".equals(type) || "INSPECTION".equals(type)) {
+ sheets.add(inspectionSheet(start, end));
+ }
+ if ("ALL".equals(type) || "HAZARD".equals(type)) {
+ sheets.add(hazardSheet(start, end));
+ }
+ if ("ALL".equals(type) || "PERMIT".equals(type)) {
+ sheets.add(permitSheet(start, end));
+ sheets.add(monitorSheet());
+ }
+ if ("ALL".equals(type) || "MATERIAL".equals(type)) {
+ sheets.add(materialSheet());
+ sheets.add(stockSheet(start, end));
+ }
+ if ("ALL".equals(type) || "TRAINING".equals(type)) {
+ sheets.add(trainingSheet(start, end));
+ }
+ if ("ALL".equals(type) || "DRILL".equals(type)) {
+ sheets.add(drillSheet(start, end));
+ }
+ if ("ALL".equals(type) || "ACCIDENT".equals(type)) {
+ sheets.add(accidentSheet(start, end));
+ }
+ String filename = switch (type) {
+ case "CERT" -> "鐗圭浣滀笟璇佸彴璐�.xlsx";
+ case "INSPECTION" -> "瀹夊叏宸℃鍙拌处.xlsx";
+ case "HAZARD" -> "闅愭偅鍙拌处.xlsx";
+ case "PERMIT" -> "楂樺嵄浣滀笟绁ㄥ彴璐�.xlsx";
+ case "MATERIAL" -> "搴旀�ョ墿璧勫彴璐�.xlsx";
+ case "TRAINING" -> "瀹夊叏鍩硅鍙拌处.xlsx";
+ case "DRILL" -> "娑堥槻婕旂粌鍙拌处.xlsx";
+ case "ACCIDENT" -> "浜嬫晠鐧昏鍙拌处.xlsx";
+ default -> "瀹夊叏鐢熶骇鏍囧噯鍖栧彴璐�.xlsx";
+ };
+ write(response, filename, sheets);
+ }
+
+ // ==================== 鍚� Sheet ====================
+
+ private Sheet certSheet() {
+ List<String> headers = List.of("鎸佽瘉浜�", "宸ュ彿", "閮ㄩ棬", "璇佷欢绫诲瀷", "璇佷欢缂栧彿", "鍙戣瘉鏈哄叧",
+ "鍙戣瘉鏃ユ湡", "鏈夋晥鏈熻嚦", "涓嬫澶嶅", "鐘舵��", "棰勮澶╂暟", "澶囨敞");
+ var pageReqVO = new cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert.SafetyCertificatePageReqVO();
+ pageReqVO.setPageNo(1);
+ pageReqVO.setPageSize(50_000);
+ var certs = certificateService.getCertificatePage(pageReqVO).getList();
+ // 瀵煎嚭鏃剁敤鍛樺伐妗f鐨勬渶鏂板鍚�/宸ュ彿/閮ㄩ棬
+ certificateService.fillEmployeeInfo(certs);
+ List<List<Object>> rows = certs.stream()
+ .map(c -> Arrays.<Object>asList(
+ str(c.getEmployeeName()), str(c.getEmployeeNo()), str(c.getDeptName()),
+ SafetyCertificateTypeEnum.getNameByType(c.getCertType()), str(c.getCertNo()),
+ str(c.getIssuer()), date(c.getIssueDate()), date(c.getExpireDate()),
+ date(c.getReviewDate()),
+ SafetyCertificateStatusEnum.getNameByStatus(SafetyCertificateService.resolveStatus(
+ c.getExpireDate(), c.getWarnDays(), c.getStatus())),
+ Objects.toString(c.getWarnDays(), ""), str(c.getRemark())))
+ .toList();
+ return new Sheet("鐗圭浣滀笟璇佸彴璐�", headers, rows);
+ }
+
+ private Sheet inspectionSheet(LocalDate start, LocalDate end) {
+ List<String> headers = List.of("宸℃鏃堕棿", "鐐逛綅鍚嶇О", "鐐逛綅绫诲瀷", "宸℃浜�", "缁撴灉", "宸℃鎯呭喌", "鍙戠幇闅愭偅鏁�");
+ var reqVO = new cn.iocoder.yudao.module.mes.controller.admin.safety.vo.inspection.SafetyInspectionPageReqVO();
+ reqVO.setPageNo(1);
+ reqVO.setPageSize(50_000);
+ if (start != null && end != null) {
+ reqVO.setInspectTime(new java.time.LocalDateTime[]{start.atStartOfDay(), end.atTime(23, 59, 59)});
+ }
+ var inspections = inspectionService.getInspectionPage(reqVO).getList();
+ inspectionService.fillInspectorNames(inspections);
+ List<List<Object>> rows = inspections.stream()
+ .map(i -> Arrays.<Object>asList(
+ dateTime(i.getInspectTime()), str(i.getPointName()),
+ SafetyInspectionPointTypeEnum.getNameByType(i.getPointType()),
+ str(i.getInspector()),
+ "NORMAL".equals(i.getResult()) ? "姝e父" : "寮傚父",
+ str(i.getContent()), Objects.toString(i.getHazardCount(), "0")))
+ .toList();
+ return new Sheet("瀹夊叏宸℃鍙拌处", headers, rows);
+ }
+
+ private Sheet hazardSheet(LocalDate start, LocalDate end) {
+ List<String> headers = List.of("闅愭偅缂栧彿", "鏍囬", "绛夌骇", "鏉ユ簮", "浣嶇疆", "涓婃姤浜�", "涓婃姤鏃堕棿",
+ "鏁存敼璐d换浜�", "鏁存敼鏈熼檺", "鏁存敼鎺柦", "鏁存敼鏃堕棿", "澶嶆煡浜�", "澶嶆煡鏃堕棿", "澶嶆煡缁撹", "鐘舵��", "闂幆鏃堕棿");
+ var reqVO = new cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard.SafetyHazardPageReqVO();
+ reqVO.setPageNo(1);
+ reqVO.setPageSize(50_000);
+ if (start != null && end != null) {
+ reqVO.setReportTime(new java.time.LocalDateTime[]{start.atStartOfDay(), end.atTime(23, 59, 59)});
+ }
+ var hazards = hazardService.getHazardPage(reqVO).getList();
+ hazardService.fillPersonNames(hazards);
+ List<List<Object>> rows = hazards.stream()
+ .map(h -> Arrays.<Object>asList(
+ str(h.getCode()), str(h.getTitle()),
+ SafetyHazardLevelEnum.getNameByLevel(h.getLevel()),
+ SafetyHazardSourceEnum.getNameBySource(h.getSource()),
+ str(h.getLocation()), str(h.getReporter()), dateTime(h.getReportTime()),
+ str(h.getAssignee()), date(h.getRectifyDeadline()), str(h.getRectifyDesc()),
+ dateTime(h.getRectifyTime()), str(h.getRechecker()), dateTime(h.getRecheckTime()),
+ "PASSED".equals(str(h.getRecheckResult())) ? "閫氳繃"
+ : "REJECTED".equals(str(h.getRecheckResult())) ? "涓嶉�氳繃" : "",
+ SafetyHazardStatusEnum.getNameByStatus(h.getStatus()), dateTime(h.getCloseTime())))
+ .toList();
+ return new Sheet("闅愭偅鍙拌处", headers, rows);
+ }
+
+ private Sheet permitSheet(LocalDate start, LocalDate end) {
+ List<String> headers = List.of("浣滀笟绁ㄧ紪鍙�", "浣滀笟绫诲瀷", "浣滀笟鍚嶇О", "浣滀笟鍖哄煙", "浣滀笟鍦扮偣", "鐢宠浜�",
+ "鐢宠鏃堕棿", "璁″垝寮�濮�", "璁″垝缁撴潫", "瀹為檯寮�濮�", "瀹為檯缁撴潫", "椋庨櫓绛夌骇", "鐩戞姢浜�",
+ "瀹℃壒浜�", "瀹℃壒鏃堕棿", "瀹℃壒鎰忚", "鐘舵��");
+ var reqVO = new cn.iocoder.yudao.module.mes.controller.admin.safety.vo.permit.SafetyWorkPermitPageReqVO();
+ reqVO.setPageNo(1);
+ reqVO.setPageSize(50_000);
+ if (start != null && end != null) {
+ reqVO.setPlanStartTime(new java.time.LocalDateTime[]{start.atStartOfDay(), end.atTime(23, 59, 59)});
+ }
+ var permits = permitService.getPermitPage(reqVO).getList();
+ permitService.fillPermitRefs(permits);
+ List<List<Object>> rows = permits.stream()
+ .map(p -> Arrays.<Object>asList(
+ str(p.getCode()), SafetyPermitTypeEnum.getNameByType(p.getPermitType()),
+ str(p.getTitle()), str(p.getWorkshopName()), str(p.getLocation()),
+ str(p.getApplicant()), dateTime(p.getApplyTime()), dateTime(p.getPlanStartTime()),
+ dateTime(p.getPlanEndTime()), dateTime(p.getActualStartTime()), dateTime(p.getActualEndTime()),
+ SafetyRiskLevelEnum.getNameByLevel(p.getRiskLevel()), str(p.getGuardian()),
+ str(p.getApprover()), dateTime(p.getApproveTime()), str(p.getApproveComment()),
+ SafetyPermitStatusEnum.getNameByStatus(p.getStatus())))
+ .toList();
+ return new Sheet("楂樺嵄浣滀笟绁ㄥ彴璐�", headers, rows);
+ }
+
+ private Sheet monitorSheet() {
+ List<String> headers = List.of("浣滀笟绁ㄧ紪鍙�", "鐩戞姢鏃堕棿", "鐩戞姢浜�", "鐩戞姢鍐呭", "寮傚父鎯呭喌");
+ var reqVO = new cn.iocoder.yudao.module.mes.controller.admin.safety.vo.permit.SafetyWorkPermitPageReqVO();
+ reqVO.setPageNo(1);
+ reqVO.setPageSize(5_000);
+ List<List<Object>> rows = new ArrayList<>();
+ for (SafetyWorkPermitDO permit : permitService.getPermitPage(reqVO).getList()) {
+ var monitors = permitService.getMonitorList(permit.getId());
+ permitService.fillMonitorGuardians(monitors);
+ for (SafetyWorkPermitMonitorDO monitor : monitors) {
+ rows.add(Arrays.asList(str(permit.getCode()), dateTime(monitor.getMonitorTime()),
+ str(monitor.getGuardian()), str(monitor.getMonitorContent()), str(monitor.getAbnormal())));
+ }
+ }
+ return new Sheet("浣滀笟鐩戞姢璁板綍", headers, rows);
+ }
+
+ private Sheet materialSheet() {
+ List<String> headers = List.of("鐗╄祫缂栫爜", "鐗╄祫鍚嶇О", "绫诲埆", "瑙勬牸鍨嬪彿", "鍗曚綅", "搴撳瓨鏁伴噺",
+ "瀹夊叏搴撳瓨", "瀛樻斁浣嶇疆", "鏈夋晥鏈熻嚦", "淇濈浜�", "鐘舵��");
+ var reqVO = new cn.iocoder.yudao.module.mes.controller.admin.safety.vo.material.SafetyMaterialPageReqVO();
+ reqVO.setPageNo(1);
+ reqVO.setPageSize(50_000);
+ var materials = materialService.getMaterialPage(reqVO).getList();
+ materialService.fillManagers(materials);
+ List<List<Object>> rows = materials.stream()
+ .map(m -> Arrays.<Object>asList(
+ str(m.getCode()), str(m.getName()),
+ SafetyMaterialCategoryEnum.getNameByCategory(m.getCategory()),
+ str(m.getSpec()), str(m.getUnit()), number(m.getStockQty()), number(m.getSafeStock()),
+ str(m.getStorageLocation()), date(m.getExpireDate()), str(m.getManager()),
+ Integer.valueOf(0).equals(m.getStatus()) ? "鍚敤" : "鍋滅敤"))
+ .toList();
+ return new Sheet("搴旀�ョ墿璧勫彴璐�", headers, rows);
+ }
+
+ private Sheet stockSheet(LocalDate start, LocalDate end) {
+ List<String> headers = List.of("涓氬姟鏃ユ湡", "鐗╄祫鍚嶇О", "绫诲埆", "涓氬姟绫诲瀷", "鏁伴噺",
+ "鎿嶄綔鍓嶅簱瀛�", "鎿嶄綔鍚庡簱瀛�", "缁忓姙浜�", "棰嗙敤浜�", "鐢ㄩ��/鍘诲悜");
+ var reqVO = new cn.iocoder.yudao.module.mes.controller.admin.safety.vo.material.SafetyMaterialStockPageReqVO();
+ reqVO.setPageNo(1);
+ reqVO.setPageSize(50_000);
+ if (start != null && end != null) {
+ reqVO.setBizDate(new LocalDate[]{start, end});
+ }
+ List<List<Object>> rows = materialService.getStockPage(reqVO).getList().stream()
+ .map(s -> Arrays.<Object>asList(
+ date(s.getBizDate()), str(s.getMaterialName()),
+ SafetyMaterialCategoryEnum.getNameByCategory(s.getCategory()),
+ "IN".equals(s.getBizType()) ? "鍏ュ簱" : "鍑哄簱",
+ number(s.getQuantity()), number(s.getStockBefore()), number(s.getStockAfter()),
+ str(s.getOperator()), str(s.getReceiver()), str(s.getPurpose())))
+ .toList();
+ return new Sheet("鐗╄祫鍑哄叆搴撴祦姘�", headers, rows);
+ }
+
+ private Sheet trainingSheet(LocalDate start, LocalDate end) {
+ List<String> headers = List.of("鍩硅鏃ユ湡", "鍩硅涓婚", "鍩硅绫诲瀷", "瀛︽椂", "璁插笀/缁勭粐浜�",
+ "鍩硅鍦扮偣", "鍙傚姞浜烘暟", "鍩硅鍐呭", "鑰冩牳鎯呭喌");
+ var trainings = trainingService.listTrainingBetween(start, end);
+ trainingService.fillTrainers(trainings);
+ List<List<Object>> rows = trainings.stream()
+ .map(t -> Arrays.<Object>asList(
+ date(t.getTrainDate()), str(t.getTitle()),
+ SafetyTrainingTypeEnum.getNameByType(t.getTrainingType()),
+ number(t.getDurationHours()), str(t.getTrainer()), str(t.getLocation()),
+ Objects.toString(t.getParticipantCount(), "0"),
+ str(t.getContent()), str(t.getExamResult())))
+ .toList();
+ return new Sheet("瀹夊叏鍩硅鍙拌处", headers, rows);
+ }
+
+ private Sheet drillSheet(LocalDate start, LocalDate end) {
+ List<String> headers = List.of("婕旂粌鏃ユ湡", "婕旂粌鍚嶇О", "婕旂粌绫诲瀷", "鍦扮偣", "缁勭粐浜�",
+ "鍙傚姞浜烘暟", "鏃堕暱(鍒嗛挓)", "婕旂粌杩囩▼", "鎬荤粨涓庢敼杩�");
+ var drills = trainingService.listDrillBetween(start, end);
+ trainingService.fillOrganizers(drills);
+ List<List<Object>> rows = drills.stream()
+ .map(d -> Arrays.<Object>asList(
+ date(d.getDrillDate()), str(d.getTitle()),
+ SafetyDrillTypeEnum.getNameByType(d.getDrillType()), str(d.getLocation()),
+ str(d.getOrganizer()), Objects.toString(d.getParticipantCount(), "0"),
+ Objects.toString(d.getDurationMinutes(), ""),
+ str(d.getProcessDesc()), str(d.getSummary())))
+ .toList();
+ return new Sheet("娑堥槻婕旂粌鍙拌处", headers, rows);
+ }
+
+ private Sheet accidentSheet(LocalDate start, LocalDate end) {
+ List<String> headers = List.of("浜嬫晠缂栧彿", "浜嬫晠鍚嶇О", "浜嬫晠绫诲瀷", "绛夌骇", "鍙戠敓鏃堕棿", "鍙戠敓鍦扮偣",
+ "浼や骸鎯呭喌", "缁忔祹鎹熷け(鍏�)", "浜嬫晠缁忚繃", "鍘熷洜鍒嗘瀽", "澶勭悊鎺柦", "鐘舵��");
+ var accidents = trainingService.listAccidentBetween(start, end);
+ trainingService.fillAccidentRefs(accidents);
+ List<List<Object>> rows = accidents.stream()
+ .map(a -> Arrays.<Object>asList(
+ str(a.getCode()), str(a.getTitle()),
+ SafetyAccidentTypeEnum.getNameByType(a.getAccidentType()),
+ SafetyAccidentLevelEnum.getNameByLevel(a.getLevel()),
+ dateTime(a.getOccurTime()), str(a.getLocation()), str(a.getCasualtyDesc()),
+ number(a.getEconomicLoss()), str(a.getDescription()), str(a.getCauseAnalysis()),
+ str(a.getMeasures()), SafetyAccidentStatusEnum.getNameByStatus(a.getStatus())))
+ .toList();
+ return new Sheet("浜嬫晠鐧昏鍙拌处", headers, rows);
+ }
+
+ // ==================== 宸ュ叿鏂规硶 ====================
+
+ private static String str(String value) {
+ return value == null ? "" : value;
+ }
+
+ private static String date(LocalDate value) {
+ return value == null ? "" : value.toString();
+ }
+
+ private static String dateTime(java.time.LocalDateTime value) {
+ return value == null ? "" : value.toString().replace('T', ' ');
+ }
+
+ private static String number(java.math.BigDecimal value) {
+ return value == null ? "" : value.stripTrailingZeros().toPlainString();
+ }
+
+ private record Sheet(String name, List<String> headers, List<List<Object>> rows) {
+ }
+
+ private void write(HttpServletResponse response, String filename, List<Sheet> sheets) throws IOException {
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setHeader("Content-Disposition", "attachment;filename=" + HttpUtils.encodeUtf8(filename));
+ try (var writer = FastExcelFactory.write(response.getOutputStream()).autoCloseStream(false).build()) {
+ for (int i = 0; i < sheets.size(); i++) {
+ Sheet sheet = sheets.get(i);
+ writer.write(sheet.rows(), FastExcelFactory.writerSheet(i, sheet.name())
+ .head(sheet.headers().stream().map(List::of).toList()).build());
+ }
+ }
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyMaterialService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyMaterialService.java
new file mode 100644
index 0000000..7b9f0b5
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyMaterialService.java
@@ -0,0 +1,192 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.material.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyMaterialDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyMaterialStockDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyMaterialMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyMaterialStockMapper;
+import cn.iocoder.yudao.module.mes.enums.safety.SafetyMaterialCategoryEnum;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.SafetyErrorCodeConstants.*;
+
+/**
+ * 瀹夊叏鐢熶骇 - 搴旀�ョ墿璧勫彴璐︿笌鍑哄叆搴� Service
+ *
+ * <p>瑕嗙洊鐢靛姏缁濈紭鐢ㄥ叿銆佸嵄鍖栧搧銆佹秷闃茬墿璧勩�傚嚭搴撴椂琛岄攣鏍¢獙搴撳瓨锛岄伩鍏嶅苟鍙戞墸鍑忎负璐熴��</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class SafetyMaterialService {
+
+ @Resource
+ private SafetyMaterialMapper materialMapper;
+ @Resource
+ private SafetyRefResolver refResolver;
+ @Resource
+ private SafetyMaterialStockMapper stockMapper;
+
+ // ==================== 鐗╄祫鍙拌处 ====================
+
+ public Long createMaterial(SafetyMaterialSaveReqVO reqVO) {
+ reqVO.setId(null);
+ String code = StrUtil.trim(reqVO.getCode());
+ if (materialMapper.selectByCode(code) != null) {
+ throw exception(SAFETY_MATERIAL_CODE_DUPLICATE);
+ }
+ SafetyMaterialDO material = BeanUtils.toBean(reqVO, SafetyMaterialDO.class);
+ material.setCode(code);
+ material.setName(StrUtil.trim(reqVO.getName()));
+ material.setUnit(StrUtil.blankToDefault(reqVO.getUnit(), "涓�"));
+ applyManager(material, reqVO.getManagerId());
+ material.setStockQty(reqVO.getStockQty() == null ? BigDecimal.ZERO : reqVO.getStockQty());
+ material.setSafeStock(reqVO.getSafeStock() == null ? BigDecimal.ZERO : reqVO.getSafeStock());
+ materialMapper.insert(material);
+ return material.getId();
+ }
+
+ public void updateMaterial(SafetyMaterialSaveReqVO reqVO) {
+ SafetyMaterialDO old = validateMaterialExists(reqVO.getId());
+ String code = StrUtil.trim(reqVO.getCode());
+ SafetyMaterialDO byCode = materialMapper.selectByCode(code);
+ if (byCode != null && !byCode.getId().equals(old.getId())) {
+ throw exception(SAFETY_MATERIAL_CODE_DUPLICATE);
+ }
+ SafetyMaterialDO material = BeanUtils.toBean(reqVO, SafetyMaterialDO.class);
+ material.setCode(code);
+ material.setName(StrUtil.trim(reqVO.getName()));
+ applyManager(material, reqVO.getManagerId());
+ // 搴撳瓨鏁伴噺鍙兘閫氳繃鍑哄叆搴撳崟鍙樺姩锛岀姝㈢洿鎺ョ紪杈�
+ material.setStockQty(null);
+ materialMapper.updateById(material);
+ }
+
+ public void deleteMaterial(Long id) {
+ validateMaterialExists(id);
+ materialMapper.deleteById(id);
+ }
+
+ public SafetyMaterialDO getMaterial(Long id) {
+ return validateMaterialExists(id);
+ }
+
+ public PageResult<SafetyMaterialDO> getMaterialPage(SafetyMaterialPageReqVO reqVO) {
+ return materialMapper.selectPage(reqVO);
+ }
+
+ /**
+ * 淇濈浜猴細浠庡憳宸ユ。妗堝甫鍑哄鍚嶈惤蹇収
+ */
+ private void applyManager(SafetyMaterialDO material, Long managerId) {
+ material.setManagerId(managerId);
+ material.setManager(managerId == null ? ""
+ : refResolver.requireEmployee(managerId, SAFETY_EMPLOYEE_REQUIRED).getName());
+ }
+
+ /**
+ * 鎵归噺鍥炲~淇濈浜烘渶鏂板鍚�
+ */
+ public void fillManagers(List<SafetyMaterialDO> materials) {
+ if (CollUtil.isEmpty(materials)) {
+ return;
+ }
+ var employeeMap = refResolver.employeeMap(materials.stream().map(SafetyMaterialDO::getManagerId).toList());
+ materials.forEach(material -> {
+ var employee = employeeMap.get(material.getManagerId());
+ if (employee != null) material.setManager(employee.getName());
+ });
+ }
+
+ public static void fillMaterialDisplay(SafetyMaterialDO material, SafetyMaterialRespVO respVO) {
+ respVO.setCategoryName(SafetyMaterialCategoryEnum.getNameByCategory(material.getCategory()));
+ BigDecimal stock = material.getStockQty() == null ? BigDecimal.ZERO : material.getStockQty();
+ BigDecimal safe = material.getSafeStock() == null ? BigDecimal.ZERO : material.getSafeStock();
+ respVO.setBelowSafeStock(safe.signum() > 0 && stock.compareTo(safe) < 0);
+ if (material.getExpireDate() != null) {
+ respVO.setExpireRemainingDays(ChronoUnit.DAYS.between(LocalDate.now(), material.getExpireDate()));
+ }
+ }
+
+ // ==================== 鍑哄叆搴� ====================
+
+ /**
+ * 鍑哄叆搴撶櫥璁帮細琛岄攣璇诲彇搴撳瓨 鈫� 璁$畻鍙樺姩 鈫� 鍐欐祦姘� 鈫� 鍥炲啓搴撳瓨
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public Long createStock(SafetyMaterialStockSaveReqVO reqVO) {
+ SafetyMaterialDO material = materialMapper.selectByIdForUpdate(reqVO.getMaterialId());
+ if (material == null) {
+ throw exception(SAFETY_MATERIAL_NOT_EXISTS);
+ }
+ BigDecimal before = material.getStockQty() == null ? BigDecimal.ZERO : material.getStockQty();
+ boolean inbound = "IN".equals(reqVO.getBizType());
+ BigDecimal after = inbound ? before.add(reqVO.getQuantity()) : before.subtract(reqVO.getQuantity());
+ if (!inbound && after.signum() < 0) {
+ throw exception(SAFETY_MATERIAL_STOCK_NOT_ENOUGH);
+ }
+ SafetyMaterialStockDO stock = BeanUtils.toBean(reqVO, SafetyMaterialStockDO.class);
+ stock.setId(null);
+ stock.setMaterialName(material.getName());
+ stock.setCategory(material.getCategory());
+ stock.setQuantity(reqVO.getQuantity());
+ stock.setStockBefore(before);
+ stock.setStockAfter(after);
+ stock.setBizDate(reqVO.getBizDate() == null ? LocalDate.now() : reqVO.getBizDate());
+ stock.setOperator(StrUtil.trim(reqVO.getOperator()));
+ stockMapper.insert(stock);
+
+ SafetyMaterialDO update = new SafetyMaterialDO();
+ update.setId(material.getId());
+ update.setStockQty(after);
+ materialMapper.updateById(update);
+ return stock.getId();
+ }
+
+ public PageResult<SafetyMaterialStockDO> getStockPage(SafetyMaterialStockPageReqVO reqVO) {
+ return stockMapper.selectPage(reqVO);
+ }
+
+ public static void fillStockDisplay(SafetyMaterialStockDO stock, SafetyMaterialStockRespVO respVO) {
+ respVO.setCategoryName(SafetyMaterialCategoryEnum.getNameByCategory(stock.getCategory()));
+ respVO.setBizTypeName("IN".equals(stock.getBizType()) ? "鍏ュ簱" : "鍑哄簱");
+ }
+
+ /**
+ * 棰勮娓呭崟锛氫綆浜庡畨鍏ㄥ簱瀛樼殑鐗╄祫
+ */
+ public List<SafetyMaterialDO> getBelowSafeStockList() {
+ return materialMapper.selectBelowSafeStock();
+ }
+
+ /**
+ * 棰勮娓呭崟锛氭湁鏁堟湡涓磋繎锛堥粯璁� 30 澶╁唴锛夌殑鐗╄祫
+ */
+ public List<SafetyMaterialDO> getExpiringList(Integer days) {
+ int warnDays = days == null || days <= 0 ? 30 : days;
+ return materialMapper.selectExpiringBefore(LocalDate.now().plusDays(warnDays));
+ }
+
+ private SafetyMaterialDO validateMaterialExists(Long id) {
+ SafetyMaterialDO material = id == null ? null : materialMapper.selectById(id);
+ if (material == null) {
+ throw exception(SAFETY_MATERIAL_NOT_EXISTS);
+ }
+ return material;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyOrgService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyOrgService.java
new file mode 100644
index 0000000..c9594a8
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyOrgService.java
@@ -0,0 +1,157 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.org.SafetyOrgRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.org.SafetyOrgSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyOrgDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyOrgMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.SafetyErrorCodeConstants.*;
+
+/**
+ * 瀹夊叏鐢熶骇 - 瀹夊叏缁勭粐鏋舵瀯 Service
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class SafetyOrgService {
+
+ @Resource
+ private SafetyOrgMapper safetyOrgMapper;
+ @Resource
+ private SafetyRefResolver refResolver;
+
+ public Long createOrg(SafetyOrgSaveReqVO reqVO) {
+ reqVO.setId(null);
+ validateParent(reqVO.getParentId(), null);
+ SafetyOrgDO org = BeanUtils.toBean(reqVO, SafetyOrgDO.class);
+ org.setParentId(reqVO.getParentId() == null ? 0L : reqVO.getParentId());
+ applyLeader(org, reqVO.getLeaderId());
+ safetyOrgMapper.insert(org);
+ return org.getId();
+ }
+
+ public void updateOrg(SafetyOrgSaveReqVO reqVO) {
+ validateOrgExists(reqVO.getId());
+ validateParent(reqVO.getParentId(), reqVO.getId());
+ SafetyOrgDO org = BeanUtils.toBean(reqVO, SafetyOrgDO.class);
+ org.setParentId(reqVO.getParentId() == null ? 0L : reqVO.getParentId());
+ applyLeader(org, reqVO.getLeaderId());
+ safetyOrgMapper.updateById(org);
+ }
+
+ /**
+ * 璐熻矗浜猴細浠庡憳宸ユ。妗堝甫鍑哄鍚嶄笌鐢佃瘽骞惰惤蹇収
+ */
+ private void applyLeader(SafetyOrgDO org, Long leaderId) {
+ org.setLeaderId(leaderId);
+ if (leaderId == null) {
+ org.setLeaderName("");
+ return;
+ }
+ var employee = refResolver.requireEmployee(leaderId, SAFETY_EMPLOYEE_REQUIRED);
+ org.setLeaderName(employee.getName());
+ org.setLeaderPhone(employee.getPhone());
+ }
+
+ public void deleteOrg(Long id) {
+ validateOrgExists(id);
+ if (safetyOrgMapper.selectCountByParentId(id) > 0) {
+ throw exception(SAFETY_ORG_HAS_CHILDREN);
+ }
+ safetyOrgMapper.deleteById(id);
+ }
+
+ public SafetyOrgDO getOrg(Long id) {
+ return validateOrgExists(id);
+ }
+
+ /**
+ * 鍙栬礋璐d汉鏈�鏂版。妗堬紙渚涘崟鏉℃煡璇㈠洖濉敤锛�
+ */
+ public cn.iocoder.yudao.module.hrm.api.employee.dto.HrmEmployeeSimpleDTO getLeader(Long leaderId) {
+ return refResolver.findEmployee(leaderId);
+ }
+
+ /**
+ * 鏌ヨ缁勭粐鏍�
+ */
+ public List<SafetyOrgRespVO> getOrgTree() {
+ List<SafetyOrgDO> all = safetyOrgMapper.selectListOrdered();
+ List<SafetyOrgRespVO> nodes = BeanUtils.toBean(all, SafetyOrgRespVO.class);
+ // 璐熻矗浜虹敤鍛樺伐妗f鏈�鏂板鍚嶈鐩栧揩鐓э紝鍛樺伐鏀瑰悕/璋冨矖鍚庢爲涔熷悓姝�
+ var employeeMap = refResolver.employeeMap(
+ all.stream().map(SafetyOrgDO::getLeaderId).toList());
+ nodes.forEach(node -> {
+ var employee = employeeMap.get(node.getLeaderId());
+ if (employee != null) {
+ node.setLeaderName(employee.getName());
+ }
+ });
+ Map<Long, List<SafetyOrgRespVO>> grouped = nodes.stream()
+ .collect(Collectors.groupingBy(SafetyOrgRespVO::getParentId, Collectors.toList()));
+ nodes.forEach(node -> node.setChildren(grouped.getOrDefault(node.getId(), new ArrayList<>())));
+ List<SafetyOrgRespVO> roots = grouped.getOrDefault(0L, new ArrayList<>());
+ if (CollUtil.isEmpty(roots)) {
+ // 鍏煎 parentId 涓虹┖鐨勮剰鏁版嵁
+ roots = nodes.stream().filter(n -> n.getParentId() == null || n.getParentId() == 0L).toList();
+ }
+ return roots;
+ }
+
+ private void validateParent(Long parentId, Long selfId) {
+ if (parentId == null || parentId == 0L) {
+ return;
+ }
+ if (parentId.equals(selfId)) {
+ throw exception(SAFETY_ORG_PARENT_IS_SELF);
+ }
+ SafetyOrgDO parent = safetyOrgMapper.selectById(parentId);
+ if (parent == null) {
+ throw exception(SAFETY_ORG_PARENT_NOT_EXISTS);
+ }
+ // 闃叉鎶婄埗鑺傜偣鎸傚埌鑷繁鐨勫瓙瀛欎笅锛屽舰鎴愮幆
+ if (selfId != null && isDescendant(parentId, selfId)) {
+ throw exception(SAFETY_ORG_PARENT_IS_CHILD);
+ }
+ }
+
+ private boolean isDescendant(Long candidateId, Long ancestorId) {
+ Long current = candidateId;
+ int guard = 0;
+ while (current != null && current != 0L && guard++ < 100) {
+ if (current.equals(ancestorId)) {
+ return true;
+ }
+ SafetyOrgDO node = safetyOrgMapper.selectById(current);
+ if (node == null) {
+ return false;
+ }
+ current = node.getParentId();
+ }
+ return false;
+ }
+
+ private SafetyOrgDO validateOrgExists(Long id) {
+ if (id == null) {
+ throw exception(SAFETY_ORG_NOT_EXISTS);
+ }
+ SafetyOrgDO org = safetyOrgMapper.selectById(id);
+ if (org == null) {
+ throw exception(SAFETY_ORG_NOT_EXISTS);
+ }
+ return org;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyOverviewService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyOverviewService.java
new file mode 100644
index 0000000..9e1faf5
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyOverviewService.java
@@ -0,0 +1,138 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.*;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.*;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ledger.SafetyOverviewRespVO;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鎬昏缁熻 Service
+ *
+ * <p>鎻愪緵棣栭〉 KPI 涓庤秼鍔挎暟鎹紝鍏ㄩ儴鍩轰簬鐜版湁鍙拌处瀹炴椂璁$畻锛屼笉鍋氬啑浣欑粺璁¤〃銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+public class SafetyOverviewService {
+
+ private static final DateTimeFormatter MONTH_FORMAT = DateTimeFormatter.ofPattern("yyyy-MM");
+ /** 瓒嬪娍灞曠ず鏈堟暟 */
+ private static final int TREND_MONTHS = 6;
+
+ @Resource
+ private SafetyCertificateMapper certificateMapper;
+ @Resource
+ private SafetyHazardMapper hazardMapper;
+ @Resource
+ private SafetyWorkPermitMapper permitMapper;
+ @Resource
+ private SafetyMaterialMapper materialMapper;
+ @Resource
+ private SafetyTrainingMapper trainingMapper;
+ @Resource
+ private SafetyDrillMapper drillMapper;
+ @Resource
+ private SafetyAccidentMapper accidentMapper;
+
+ public SafetyOverviewRespVO getOverview() {
+ SafetyOverviewRespVO overview = new SafetyOverviewRespVO();
+ LocalDate today = LocalDate.now();
+
+ // ---------- 鐗圭浣滀笟璇� ----------
+ List<SafetyCertificateDO> certs = certificateMapper.selectList();
+ long expiring = 0;
+ long expired = 0;
+ for (SafetyCertificateDO cert : certs) {
+ String status = SafetyCertificateService.resolveStatus(
+ cert.getExpireDate(), cert.getWarnDays(), cert.getStatus());
+ if ("EXPIRED".equals(status)) {
+ expired++;
+ } else if ("EXPIRING".equals(status)) {
+ expiring++;
+ }
+ }
+ overview.setCertTotal((long) certs.size());
+ overview.setCertExpiring(expiring);
+ overview.setCertExpired(expired);
+
+ // ---------- 闅愭偅 ----------
+ List<SafetyHazardDO> hazards = hazardMapper.selectList();
+ long hazardOpen = hazards.stream()
+ .filter(h -> !"CLOSED".equals(h.getStatus())).count();
+ long hazardOverdue = hazardMapper.selectOverdue(today).size();
+ long hazardClosed = hazards.size() - hazardOpen;
+ overview.setHazardTotal((long) hazards.size());
+ overview.setHazardOpen(hazardOpen);
+ overview.setHazardOverdue(hazardOverdue);
+ overview.setHazardCloseRate(hazards.isEmpty() ? 0
+ : (int) Math.round(hazardClosed * 100.0 / hazards.size()));
+
+ // ---------- 浣滀笟绁� ----------
+ List<SafetyWorkPermitDO> permits = permitMapper.selectList();
+ overview.setPermitPending(permits.stream()
+ .filter(p -> "PENDING".equals(p.getStatus())).count());
+ overview.setPermitInProgress(permits.stream()
+ .filter(p -> "IN_PROGRESS".equals(p.getStatus())).count());
+
+ // ---------- 鐗╄祫 ----------
+ overview.setMaterialBelowSafeStock((long) materialMapper.selectBelowSafeStock().size());
+ overview.setMaterialExpiring((long) materialMapper.selectExpiringBefore(today.plusDays(30)).size());
+
+ // ---------- 鏈湀娲诲姩 ----------
+ YearMonth currentMonth = YearMonth.from(today);
+ LocalDate monthStart = currentMonth.atDay(1);
+ LocalDate monthEnd = currentMonth.atEndOfMonth();
+ overview.setTrainingThisMonth((long) trainingMapper.selectListBetween(monthStart, monthEnd).size());
+ overview.setDrillThisMonth((long) drillMapper.selectListBetween(monthStart, monthEnd).size());
+ overview.setAccidentThisMonth((long) accidentMapper.selectListBetween(
+ monthStart.atStartOfDay(), monthEnd.atTime(23, 59, 59)).size());
+
+ // ---------- 瓒嬪娍锛堣繎 6 涓湀锛� ----------
+ overview.setHazardTrend(buildTrend(hazards.stream().map(SafetyHazardDO::getReportTime).toList()));
+ overview.setAccidentTrend(buildTrend(hazards.isEmpty() ? List.of()
+ : accidentMapper.selectList().stream().map(SafetyAccidentDO::getOccurTime).toList()));
+
+ return overview;
+ }
+
+ /**
+ * 鎸夋湀鑱氬悎鏃堕棿鐐癸紝杈撳嚭杩� N 涓湀鐨勮繛缁簭鍒楋紙鏃犳暟鎹殑鏈堜唤琛� 0锛�
+ */
+ private List<SafetyOverviewRespVO.MonthlyCount> buildTrend(List<LocalDateTime> times) {
+ Map<String, Long> counts = new LinkedHashMap<>();
+ YearMonth current = YearMonth.from(LocalDate.now());
+ List<YearMonth> months = new ArrayList<>();
+ for (int i = TREND_MONTHS - 1; i >= 0; i--) {
+ YearMonth month = current.minusMonths(i);
+ months.add(month);
+ counts.put(month.format(MONTH_FORMAT), 0L);
+ }
+ for (LocalDateTime time : times) {
+ if (time == null) {
+ continue;
+ }
+ String key = YearMonth.from(time).format(MONTH_FORMAT);
+ if (counts.containsKey(key)) {
+ counts.put(key, counts.get(key) + 1);
+ }
+ }
+ return months.stream().map(month -> {
+ SafetyOverviewRespVO.MonthlyCount item = new SafetyOverviewRespVO.MonthlyCount();
+ item.setMonth(month.format(MONTH_FORMAT));
+ item.setCount(counts.get(month.format(MONTH_FORMAT)));
+ return item;
+ }).toList();
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRefResolver.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRefResolver.java
new file mode 100644
index 0000000..702a2ff
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRefResolver.java
@@ -0,0 +1,122 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.module.hrm.api.employee.HrmEmployeeApi;
+import cn.iocoder.yudao.module.hrm.api.employee.dto.HrmEmployeeSimpleDTO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkshopDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.md.workstation.MesMdWorkshopMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Component;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.SafetyErrorCodeConstants.*;
+
+/**
+ * 瀹夊叏鐢熶骇 - 涓绘暟鎹紩鐢ㄨВ鏋愬櫒
+ *
+ * <p>妯″潡鍐呮墍鏈夈�屼汉鍛樸�嶄笌銆岃溅闂淬�嶅瓧娈电粺涓�璧拌繖閲岃В鏋愶紝閬垮厤姣忎釜 Service 閲嶅鍐欎竴閬嶃��</p>
+ *
+ * <p>缁熶竴绾﹀畾锛氫笟鍔¤〃瀛� {@code xxxId} 鍏宠仈涓绘暟鎹紝鍚屾椂淇濈暀 {@code xxxName} 浣滀负蹇収銆�
+ * 淇濆瓨鏃朵粠涓绘暟鎹妸鍚嶇О甯﹀嚭鍐欏揩鐓э紱鏌ヨ鏃剁敤涓绘暟鎹渶鏂板�艰鐩栧揩鐓э紝
+ * 杩欐牱鍛樺伐璋冨矖銆佽溅闂存敼鍚嶅悗鍙拌处浼氳嚜鍔ㄨ窡鐫�鍙橈紝鑰屼富鏁版嵁琚垹鏃惰�佽褰曚粛鑳介潬蹇収灞曠ず銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Component
+public class SafetyRefResolver {
+
+ @Resource
+ private HrmEmployeeApi hrmEmployeeApi;
+ @Resource
+ private MesMdWorkshopMapper workshopMapper;
+
+ // ==================== 鍛樺伐 ====================
+
+ /**
+ * 鎸夊憳宸ョ紪鍙峰彇鍛樺伐锛屽繀椤诲瓨鍦�
+ *
+ * @throws cn.iocoder.yudao.framework.common.exception.ServiceException 鍛樺伐涓嶅瓨鍦ㄦ椂鎶涘嚭
+ */
+ public HrmEmployeeSimpleDTO requireEmployee(Long employeeId, cn.iocoder.yudao.framework.common.exception.ErrorCode errorCode) {
+ if (employeeId == null) {
+ throw exception(errorCode);
+ }
+ HrmEmployeeSimpleDTO employee = hrmEmployeeApi.getEmployee(employeeId);
+ if (employee == null) {
+ throw exception(errorCode);
+ }
+ return employee;
+ }
+
+ /**
+ * 鍙┖鐨勫憳宸ヨВ鏋愶細id 涓虹┖杩斿洖 null锛屼笉鏍¢獙瀛樺湪鎬э紙鐢ㄤ簬闈炲繀濉瓧娈碉級
+ */
+ public HrmEmployeeSimpleDTO findEmployee(Long employeeId) {
+ return employeeId == null ? null : hrmEmployeeApi.getEmployee(employeeId);
+ }
+
+ /**
+ * 鎵归噺鍙栧憳宸ワ紝杩斿洖 id -> 鍛樺伐 鐨� Map
+ */
+ public Map<Long, HrmEmployeeSimpleDTO> employeeMap(Collection<Long> employeeIds) {
+ // 娉ㄦ剰锛氳繖閲屽繀椤昏繑鍥炲彲鎺ュ彈 null key 鐨勭┖ Map銆�
+ // 璋冪敤鏂逛細鐩存帴 map.get(璁板綍閲岀殑 xxxId)锛岃�� xxxId 鍏佽涓� null锛堜緥濡傜粍缁囨湭璁捐礋璐d汉銆�
+ // 璇佷欢鏈叧鑱旀寔璇佷汉锛夛紝Map.of() 鐨� get(null) 浼氭姏 NPE锛屽鑷村垪琛ㄦ帴鍙� 500銆�
+ if (CollUtil.isEmpty(employeeIds)) {
+ return new HashMap<>();
+ }
+ List<Long> ids = employeeIds.stream().filter(Objects::nonNull).distinct().toList();
+ if (ids.isEmpty()) {
+ return new HashMap<>();
+ }
+ return hrmEmployeeApi.getEmployeeList(ids).stream()
+ .collect(Collectors.toMap(HrmEmployeeSimpleDTO::getId, e -> e, (a, b) -> a));
+ }
+
+ // ==================== 杞﹂棿 ====================
+
+ /**
+ * 鎸夎溅闂寸紪鍙峰彇杞﹂棿锛屽繀椤诲瓨鍦�
+ */
+ public MesMdWorkshopDO requireWorkshop(Long workshopId) {
+ if (workshopId == null) {
+ throw exception(SAFETY_WORKSHOP_NOT_EXISTS);
+ }
+ MesMdWorkshopDO workshop = workshopMapper.selectById(workshopId);
+ if (workshop == null) {
+ throw exception(SAFETY_WORKSHOP_NOT_EXISTS);
+ }
+ return workshop;
+ }
+
+ /**
+ * 鍙┖鐨勮溅闂磋В鏋�
+ */
+ public MesMdWorkshopDO findWorkshop(Long workshopId) {
+ return workshopId == null ? null : workshopMapper.selectById(workshopId);
+ }
+
+ /**
+ * 鎵归噺鍙栬溅闂达紝杩斿洖 id -> 杞﹂棿 鐨� Map
+ */
+ public Map<Long, MesMdWorkshopDO> workshopMap(Collection<Long> workshopIds) {
+ // 鍚屼笂锛氳溅闂寸紪鍙峰厑璁镐负 null锛岀┖闆嗗悎蹇呴』杩斿洖鍙帴鍙� null key 鐨� Map
+ if (CollUtil.isEmpty(workshopIds)) {
+ return new HashMap<>();
+ }
+ List<Long> ids = workshopIds.stream().filter(Objects::nonNull).distinct().toList();
+ if (ids.isEmpty()) {
+ return new HashMap<>();
+ }
+ return workshopMapper.selectBatchIds(ids).stream()
+ .collect(Collectors.toMap(MesMdWorkshopDO::getId, w -> w, (a, b) -> a));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyTrainingService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyTrainingService.java
new file mode 100644
index 0000000..bd857fb
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyTrainingService.java
@@ -0,0 +1,273 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyAccidentDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyDrillDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyTrainingDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyAccidentMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyDrillMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyTrainingMapper;
+import cn.iocoder.yudao.module.mes.enums.safety.*;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.SafetyErrorCodeConstants.*;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鍩硅銆佹紨缁冦�佷簨鏁呯櫥璁� Service
+ *
+ * <p>涓夌被璁板綍缁熶竴褰掓。锛屼緵鏍囧噯鍖栧彴璐﹀鍑轰娇鐢ㄣ��</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class SafetyTrainingService {
+
+ private static final DateTimeFormatter CODE_DATE = DateTimeFormatter.ofPattern("yyyyMMdd");
+
+ @Resource
+ private SafetyTrainingMapper trainingMapper;
+ @Resource
+ private SafetyRefResolver refResolver;
+ @Resource
+ private SafetyDrillMapper drillMapper;
+ @Resource
+ private SafetyAccidentMapper accidentMapper;
+
+ // ==================== 鍩硅 ====================
+
+ public Long createTraining(SafetyTrainingSaveReqVO reqVO) {
+ reqVO.setId(null);
+ SafetyTrainingDO training = BeanUtils.toBean(reqVO, SafetyTrainingDO.class);
+ training.setTitle(StrUtil.trim(reqVO.getTitle()));
+ training.setTrainingType(StrUtil.blankToDefault(reqVO.getTrainingType(), SafetyTrainingTypeEnum.SAFETY.getType()));
+ training.setTrainerId(reqVO.getTrainerId());
+ training.setTrainer(reqVO.getTrainerId() == null ? ""
+ : refResolver.requireEmployee(reqVO.getTrainerId(), SAFETY_EMPLOYEE_REQUIRED).getName());
+ training.setParticipantCount(resolveCount(reqVO.getParticipantCount(), reqVO.getParticipants()));
+ training.setRemark(reqVO.getRemark() == null ? "" : reqVO.getRemark().trim());
+ trainingMapper.insert(training);
+ return training.getId();
+ }
+
+ public void updateTraining(SafetyTrainingSaveReqVO reqVO) {
+ validateTrainingExists(reqVO.getId());
+ SafetyTrainingDO training = BeanUtils.toBean(reqVO, SafetyTrainingDO.class);
+ training.setTitle(StrUtil.trim(reqVO.getTitle()));
+ training.setParticipantCount(resolveCount(reqVO.getParticipantCount(), reqVO.getParticipants()));
+ trainingMapper.updateById(training);
+ }
+
+ public void deleteTraining(Long id) {
+ validateTrainingExists(id);
+ trainingMapper.deleteById(id);
+ }
+
+ public SafetyTrainingDO getTraining(Long id) {
+ return validateTrainingExists(id);
+ }
+
+ public PageResult<SafetyTrainingDO> getTrainingPage(SafetyTrainingPageReqVO reqVO) {
+ return trainingMapper.selectPage(reqVO);
+ }
+
+ /**
+ * 浜嬫晠鐨勪富鏁版嵁寮曠敤锛氭墍灞炶溅闂� + 鐧昏浜�
+ */
+ private void applyAccidentRefs(SafetyAccidentDO accident, SafetyAccidentSaveReqVO reqVO) {
+ accident.setWorkshopId(reqVO.getWorkshopId());
+ accident.setWorkshopName(reqVO.getWorkshopId() == null ? ""
+ : refResolver.requireWorkshop(reqVO.getWorkshopId()).getName());
+ accident.setReporterId(reqVO.getReporterId());
+ accident.setReporter(reqVO.getReporterId() == null ? ""
+ : refResolver.requireEmployee(reqVO.getReporterId(), SAFETY_EMPLOYEE_REQUIRED).getName());
+ }
+
+ /** 鎵归噺鍥炲~鍩硅璁插笀鏈�鏂板鍚� */
+ public void fillTrainers(List<SafetyTrainingDO> trainings) {
+ if (CollUtil.isEmpty(trainings)) return;
+ var employeeMap = refResolver.employeeMap(trainings.stream().map(SafetyTrainingDO::getTrainerId).toList());
+ trainings.forEach(t -> {
+ var e = employeeMap.get(t.getTrainerId());
+ if (e != null) t.setTrainer(e.getName());
+ });
+ }
+
+ /** 鎵归噺鍥炲~婕旂粌缁勭粐浜烘渶鏂板鍚� */
+ public void fillOrganizers(List<SafetyDrillDO> drills) {
+ if (CollUtil.isEmpty(drills)) return;
+ var employeeMap = refResolver.employeeMap(drills.stream().map(SafetyDrillDO::getOrganizerId).toList());
+ drills.forEach(d -> {
+ var e = employeeMap.get(d.getOrganizerId());
+ if (e != null) d.setOrganizer(e.getName());
+ });
+ }
+
+ /** 鎵归噺鍥炲~浜嬫晠鐨勮溅闂村悕涓庣櫥璁颁汉濮撳悕 */
+ public void fillAccidentRefs(List<SafetyAccidentDO> accidents) {
+ if (CollUtil.isEmpty(accidents)) return;
+ var workshopMap = refResolver.workshopMap(accidents.stream().map(SafetyAccidentDO::getWorkshopId).toList());
+ var employeeMap = refResolver.employeeMap(accidents.stream().map(SafetyAccidentDO::getReporterId).toList());
+ accidents.forEach(a -> {
+ var w = workshopMap.get(a.getWorkshopId());
+ if (w != null) a.setWorkshopName(w.getName());
+ var e = employeeMap.get(a.getReporterId());
+ if (e != null) a.setReporter(e.getName());
+ });
+ }
+
+ public static void fillTrainingDisplay(SafetyTrainingDO training, SafetyTrainingRespVO respVO) {
+ respVO.setTrainingTypeName(SafetyTrainingTypeEnum.getNameByType(training.getTrainingType()));
+ }
+
+ // ==================== 婕旂粌 ====================
+
+ public Long createDrill(SafetyDrillSaveReqVO reqVO) {
+ reqVO.setId(null);
+ SafetyDrillDO drill = BeanUtils.toBean(reqVO, SafetyDrillDO.class);
+ drill.setTitle(StrUtil.trim(reqVO.getTitle()));
+ drill.setDrillType(StrUtil.blankToDefault(reqVO.getDrillType(), SafetyDrillTypeEnum.FIRE.getType()));
+ drill.setOrganizerId(reqVO.getOrganizerId());
+ drill.setOrganizer(reqVO.getOrganizerId() == null ? ""
+ : refResolver.requireEmployee(reqVO.getOrganizerId(), SAFETY_EMPLOYEE_REQUIRED).getName());
+ drill.setParticipantCount(resolveCount(reqVO.getParticipantCount(), reqVO.getParticipants()));
+ drill.setRemark(reqVO.getRemark() == null ? "" : reqVO.getRemark().trim());
+ drillMapper.insert(drill);
+ return drill.getId();
+ }
+
+ public void updateDrill(SafetyDrillSaveReqVO reqVO) {
+ validateDrillExists(reqVO.getId());
+ SafetyDrillDO drill = BeanUtils.toBean(reqVO, SafetyDrillDO.class);
+ drill.setTitle(StrUtil.trim(reqVO.getTitle()));
+ drill.setParticipantCount(resolveCount(reqVO.getParticipantCount(), reqVO.getParticipants()));
+ drillMapper.updateById(drill);
+ }
+
+ public void deleteDrill(Long id) {
+ validateDrillExists(id);
+ drillMapper.deleteById(id);
+ }
+
+ public SafetyDrillDO getDrill(Long id) {
+ return validateDrillExists(id);
+ }
+
+ public PageResult<SafetyDrillDO> getDrillPage(SafetyDrillPageReqVO reqVO) {
+ return drillMapper.selectPage(reqVO);
+ }
+
+ public static void fillDrillDisplay(SafetyDrillDO drill, SafetyDrillRespVO respVO) {
+ respVO.setDrillTypeName(SafetyDrillTypeEnum.getNameByType(drill.getDrillType()));
+ }
+
+ // ==================== 浜嬫晠 ====================
+
+ public Long createAccident(SafetyAccidentSaveReqVO reqVO) {
+ reqVO.setId(null);
+ SafetyAccidentDO accident = BeanUtils.toBean(reqVO, SafetyAccidentDO.class);
+ accident.setCode(accidentMapper.selectNextCode("AC" + LocalDate.now().format(CODE_DATE)));
+ accident.setTitle(StrUtil.trim(reqVO.getTitle()));
+ accident.setLevel(StrUtil.blankToDefault(reqVO.getLevel(), SafetyAccidentLevelEnum.GENERAL.getLevel()));
+ accident.setStatus(StrUtil.blankToDefault(reqVO.getStatus(), SafetyAccidentStatusEnum.REPORTED.getStatus()));
+ applyAccidentRefs(accident, reqVO);
+ accident.setReportTime(reqVO.getReportTime() == null ? LocalDateTime.now() : reqVO.getReportTime());
+ accident.setRemark(reqVO.getRemark() == null ? "" : reqVO.getRemark().trim());
+ accidentMapper.insert(accident);
+ return accident.getId();
+ }
+
+ public void updateAccident(SafetyAccidentSaveReqVO reqVO) {
+ validateAccidentExists(reqVO.getId());
+ SafetyAccidentDO accident = BeanUtils.toBean(reqVO, SafetyAccidentDO.class);
+ accident.setCode(null);
+ applyAccidentRefs(accident, reqVO);
+ accidentMapper.updateById(accident);
+ }
+
+ public void deleteAccident(Long id) {
+ validateAccidentExists(id);
+ accidentMapper.deleteById(id);
+ }
+
+ public SafetyAccidentDO getAccident(Long id) {
+ return validateAccidentExists(id);
+ }
+
+ public PageResult<SafetyAccidentDO> getAccidentPage(SafetyAccidentPageReqVO reqVO) {
+ return accidentMapper.selectPage(reqVO);
+ }
+
+ public static void fillAccidentDisplay(SafetyAccidentDO accident, SafetyAccidentRespVO respVO) {
+ respVO.setAccidentTypeName(SafetyAccidentTypeEnum.getNameByType(accident.getAccidentType()));
+ respVO.setLevelName(SafetyAccidentLevelEnum.getNameByLevel(accident.getLevel()));
+ respVO.setStatusName(SafetyAccidentStatusEnum.getNameByStatus(accident.getStatus()));
+ }
+
+ // ==================== 鍙拌处瀵煎嚭鐢ㄦ煡璇� ====================
+
+ public List<SafetyTrainingDO> listTrainingBetween(LocalDate begin, LocalDate end) {
+ return trainingMapper.selectListBetween(begin, end);
+ }
+
+ public List<SafetyDrillDO> listDrillBetween(LocalDate begin, LocalDate end) {
+ return drillMapper.selectListBetween(begin, end);
+ }
+
+ public List<SafetyAccidentDO> listAccidentBetween(LocalDate begin, LocalDate end) {
+ return accidentMapper.selectListBetween(
+ begin == null ? null : begin.atStartOfDay(),
+ end == null ? null : end.atTime(23, 59, 59));
+ }
+
+ // ==================== 绉佹湁 ====================
+
+ /** 鍙傚姞浜烘暟鏈~鏃讹紝鎸夊鍚嶉�楀彿鍒嗛殧鏁伴噺鎺ㄦ柇 */
+ private static int resolveCount(Integer count, String participants) {
+ if (count != null && count > 0) {
+ return count;
+ }
+ if (StrUtil.isBlank(participants)) {
+ return 0;
+ }
+ return (int) java.util.Arrays.stream(participants.split("[,锛屻�乚"))
+ .map(String::trim).filter(StrUtil::isNotBlank).count();
+ }
+
+ private SafetyTrainingDO validateTrainingExists(Long id) {
+ SafetyTrainingDO training = id == null ? null : trainingMapper.selectById(id);
+ if (training == null) {
+ throw exception(SAFETY_TRAINING_NOT_EXISTS);
+ }
+ return training;
+ }
+
+ private SafetyDrillDO validateDrillExists(Long id) {
+ SafetyDrillDO drill = id == null ? null : drillMapper.selectById(id);
+ if (drill == null) {
+ throw exception(SAFETY_DRILL_NOT_EXISTS);
+ }
+ return drill;
+ }
+
+ private SafetyAccidentDO validateAccidentExists(Long id) {
+ SafetyAccidentDO accident = id == null ? null : accidentMapper.selectById(id);
+ if (accident == null) {
+ throw exception(SAFETY_ACCIDENT_NOT_EXISTS);
+ }
+ return accident;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyWorkPermitService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyWorkPermitService.java
new file mode 100644
index 0000000..3899bc6
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyWorkPermitService.java
@@ -0,0 +1,286 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.permit.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyWorkPermitDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyWorkPermitMonitorDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyWorkPermitMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyWorkPermitMonitorMapper;
+import cn.iocoder.yudao.module.mes.enums.safety.SafetyPermitStatusEnum;
+import cn.iocoder.yudao.module.mes.enums.safety.SafetyPermitTypeEnum;
+import cn.iocoder.yudao.module.mes.enums.safety.SafetyRiskLevelEnum;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.SafetyErrorCodeConstants.*;
+
+/**
+ * 瀹夊叏鐢熶骇 - 楂樺嵄浣滀笟绁� Service
+ *
+ * <p>鍔ㄧ伀銆侀珮鍘嬪甫鐢点�佹湁闄愮┖闂寸瓑浣滀笟鐨勭嚎涓婂鎵逛笌鐢靛瓙鐣欏瓨銆�
+ * 鐘舵�佹祦杞細鑽夌 鈫� 寰呭鎵� 鈫� 宸叉壒鍑� 鈫� 浣滀笟涓� 鈫� 宸插畬缁擄紱椹冲洖/浣滃簾涓虹粓姝㈡�併��</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class SafetyWorkPermitService {
+
+ private static final DateTimeFormatter CODE_DATE = DateTimeFormatter.ofPattern("yyyyMMdd");
+
+ @Resource
+ private SafetyWorkPermitMapper permitMapper;
+ @Resource
+ private SafetyRefResolver refResolver;
+ @Resource
+ private SafetyWorkPermitMonitorMapper monitorMapper;
+
+ /**
+ * 鎻愪氦浣滀笟鐢宠锛堣崏绋挎垨寰呭鎵癸級
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public Long createPermit(SafetyWorkPermitSaveReqVO reqVO) {
+ reqVO.setId(null);
+ validateTimeRange(reqVO);
+ SafetyWorkPermitDO permit = BeanUtils.toBean(reqVO, SafetyWorkPermitDO.class);
+ permit.setCode(permitMapper.selectNextCode("WP" + LocalDate.now().format(CODE_DATE)));
+ permit.setTitle(StrUtil.trim(reqVO.getTitle()));
+ applyPermitRefs(permit, reqVO);
+ permit.setApplyTime(reqVO.getApplyTime() == null ? LocalDateTime.now() : reqVO.getApplyTime());
+ permit.setRiskLevel(StrUtil.blankToDefault(reqVO.getRiskLevel(), SafetyRiskLevelEnum.NORMAL.getLevel()));
+ permit.setStatus(SafetyPermitStatusEnum.PENDING.getStatus());
+ permit.setRemark(reqVO.getRemark() == null ? "" : reqVO.getRemark().trim());
+ permitMapper.insert(permit);
+ return permit.getId();
+ }
+
+ /**
+ * 淇敼浣滀笟绁紙浠呰崏绋�/寰呭鎵瑰彲鏀癸級
+ */
+ public void updatePermit(SafetyWorkPermitSaveReqVO reqVO) {
+ SafetyWorkPermitDO old = validatePermitExists(reqVO.getId());
+ ensureStatus(old, SafetyPermitStatusEnum.DRAFT, SafetyPermitStatusEnum.PENDING);
+ validateTimeRange(reqVO);
+ SafetyWorkPermitDO update = BeanUtils.toBean(reqVO, SafetyWorkPermitDO.class);
+ update.setCode(null);
+ update.setStatus(null);
+ applyPermitRefs(update, reqVO);
+ permitMapper.updateById(update);
+ }
+
+ /**
+ * 浣滀笟绁ㄧ殑涓绘暟鎹紩鐢細浣滀笟杞﹂棿 + 鐢宠浜� + 鐩戞姢浜猴紝浠庝富鏁版嵁甯﹀嚭鍚嶇О钀藉揩鐓�
+ */
+ private void applyPermitRefs(SafetyWorkPermitDO permit, SafetyWorkPermitSaveReqVO reqVO) {
+ permit.setWorkshopId(reqVO.getWorkshopId());
+ permit.setWorkshopName(reqVO.getWorkshopId() == null ? ""
+ : refResolver.requireWorkshop(reqVO.getWorkshopId()).getName());
+ var applicant = refResolver.requireEmployee(reqVO.getApplicantId(), SAFETY_EMPLOYEE_REQUIRED);
+ permit.setApplicantId(applicant.getId());
+ permit.setApplicant(applicant.getName());
+ permit.setGuardianId(reqVO.getGuardianId());
+ permit.setGuardian(reqVO.getGuardianId() == null ? ""
+ : refResolver.requireEmployee(reqVO.getGuardianId(), SAFETY_EMPLOYEE_REQUIRED).getName());
+ }
+
+ /**
+ * 瀹℃壒浣滀笟绁�
+ *
+ * <p>鎵瑰噯鏃舵牎楠岄珮鍗变綔涓氾紙鍔ㄧ伀/楂樺帇甯︾數/鏈夐檺绌洪棿锛夊繀椤绘寚瀹氱洃鎶や汉锛�
+ * 淇濊瘉浣滀笟绁ㄧ數瀛愮暀瀛樼殑瀹屾暣鎬с��</p>
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void approvePermit(SafetyWorkPermitApproveReqVO reqVO) {
+ SafetyWorkPermitDO permit = validatePermitExists(reqVO.getId());
+ ensureStatus(permit, SafetyPermitStatusEnum.PENDING);
+ var approver = refResolver.requireEmployee(reqVO.getApproverId(), SAFETY_EMPLOYEE_REQUIRED);
+ // 鐢宠浜轰笉鑳藉鎵硅嚜宸辩殑浣滀笟绁紙鎸夊憳宸ョ紪鍙锋瘮杈冿紝閬垮厤鍚屽悕璇垽锛�
+ if (permit.getApplicantId() != null && permit.getApplicantId().equals(approver.getId())) {
+ throw exception(SAFETY_PERMIT_SELF_APPROVE);
+ }
+ boolean approved = "APPROVED".equals(reqVO.getDecision());
+ if (approved && SafetyPermitTypeEnum.requiresGuardian(permit.getPermitType())
+ && permit.getGuardianId() == null) {
+ throw exception(SAFETY_PERMIT_GUARDIAN_REQUIRED);
+ }
+ SafetyWorkPermitDO update = new SafetyWorkPermitDO();
+ update.setId(permit.getId());
+ update.setApproverId(approver.getId());
+ update.setApprover(approver.getName());
+ update.setApproveTime(LocalDateTime.now());
+ update.setApproveComment(reqVO.getApproveComment());
+ update.setStatus(approved ? SafetyPermitStatusEnum.APPROVED.getStatus()
+ : SafetyPermitStatusEnum.REJECTED.getStatus());
+ permitMapper.updateById(update);
+ }
+
+ /**
+ * 寮�濮嬩綔涓氾紙椤诲凡鎵瑰噯锛�
+ */
+ public void startPermit(Long id) {
+ SafetyWorkPermitDO permit = validatePermitExists(id);
+ if (!SafetyPermitStatusEnum.APPROVED.getStatus().equals(permit.getStatus())) {
+ throw exception(SAFETY_PERMIT_NOT_APPROVED);
+ }
+ SafetyWorkPermitDO update = new SafetyWorkPermitDO();
+ update.setId(id);
+ update.setActualStartTime(LocalDateTime.now());
+ update.setStatus(SafetyPermitStatusEnum.IN_PROGRESS.getStatus());
+ permitMapper.updateById(update);
+ }
+
+ /**
+ * 缁撴潫浣滀笟骞跺綊妗�
+ */
+ public void closePermit(Long id) {
+ SafetyWorkPermitDO permit = validatePermitExists(id);
+ ensureStatus(permit, SafetyPermitStatusEnum.IN_PROGRESS);
+ SafetyWorkPermitDO update = new SafetyWorkPermitDO();
+ update.setId(id);
+ update.setActualEndTime(LocalDateTime.now());
+ update.setStatus(SafetyPermitStatusEnum.CLOSED.getStatus());
+ permitMapper.updateById(update);
+ }
+
+ /**
+ * 浣滃簾浣滀笟绁紙鏈畬缁撳墠鍧囧彲浣滃簾锛�
+ */
+ public void cancelPermit(Long id) {
+ SafetyWorkPermitDO permit = validatePermitExists(id);
+ if (SafetyPermitStatusEnum.CLOSED.getStatus().equals(permit.getStatus())
+ || SafetyPermitStatusEnum.CANCELLED.getStatus().equals(permit.getStatus())) {
+ throw exception(SAFETY_PERMIT_STATUS_ERROR);
+ }
+ SafetyWorkPermitDO update = new SafetyWorkPermitDO();
+ update.setId(id);
+ update.setStatus(SafetyPermitStatusEnum.CANCELLED.getStatus());
+ permitMapper.updateById(update);
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public void deletePermit(Long id) {
+ validatePermitExists(id);
+ monitorMapper.deleteByPermitId(id);
+ permitMapper.deleteById(id);
+ }
+
+ public SafetyWorkPermitDO getPermit(Long id) {
+ return validatePermitExists(id);
+ }
+
+ public PageResult<SafetyWorkPermitDO> getPermitPage(SafetyWorkPermitPageReqVO reqVO) {
+ return permitMapper.selectPage(reqVO);
+ }
+
+ // ==================== 鐩戞姢璁板綍 ====================
+
+ public Long createMonitor(SafetyWorkPermitMonitorSaveReqVO reqVO) {
+ SafetyWorkPermitDO permit = validatePermitExists(reqVO.getPermitId());
+ if (!SafetyPermitStatusEnum.IN_PROGRESS.getStatus().equals(permit.getStatus())
+ && !SafetyPermitStatusEnum.APPROVED.getStatus().equals(permit.getStatus())) {
+ throw exception(SAFETY_PERMIT_STATUS_ERROR);
+ }
+ SafetyWorkPermitMonitorDO monitor = BeanUtils.toBean(reqVO, SafetyWorkPermitMonitorDO.class);
+ monitor.setId(null);
+ var guardian = refResolver.requireEmployee(reqVO.getGuardianId(), SAFETY_EMPLOYEE_REQUIRED);
+ monitor.setGuardianId(guardian.getId());
+ monitor.setGuardian(guardian.getName());
+ monitor.setMonitorTime(reqVO.getMonitorTime() == null ? LocalDateTime.now() : reqVO.getMonitorTime());
+ monitorMapper.insert(monitor);
+ return monitor.getId();
+ }
+
+ public void deleteMonitor(Long id) {
+ if (id == null || monitorMapper.selectById(id) == null) {
+ throw exception(SAFETY_PERMIT_MONITOR_NOT_EXISTS);
+ }
+ monitorMapper.deleteById(id);
+ }
+
+ public List<SafetyWorkPermitMonitorDO> getMonitorList(Long permitId) {
+ return monitorMapper.selectListByPermitId(permitId);
+ }
+
+ // ==================== 灞曠ず瀛楁 ====================
+
+ /**
+ * 鎵归噺鍥炲~浣滀笟绁ㄧ殑杞﹂棿鍚嶄笌涓変釜浜哄憳濮撳悕锛堢敵璇蜂汉/瀹℃壒浜�/鐩戞姢浜猴級
+ */
+ public void fillPermitRefs(List<SafetyWorkPermitDO> permits) {
+ if (CollUtil.isEmpty(permits)) {
+ return;
+ }
+ var workshopMap = refResolver.workshopMap(permits.stream().map(SafetyWorkPermitDO::getWorkshopId).toList());
+ var ids = new java.util.ArrayList<Long>(permits.size() * 3);
+ permits.forEach(p -> { ids.add(p.getApplicantId()); ids.add(p.getApproverId()); ids.add(p.getGuardianId()); });
+ var employeeMap = refResolver.employeeMap(ids);
+ permits.forEach(permit -> {
+ var workshop = workshopMap.get(permit.getWorkshopId());
+ if (workshop != null) permit.setWorkshopName(workshop.getName());
+ var applicant = employeeMap.get(permit.getApplicantId());
+ if (applicant != null) permit.setApplicant(applicant.getName());
+ var approver = employeeMap.get(permit.getApproverId());
+ if (approver != null) permit.setApprover(approver.getName());
+ var guardian = employeeMap.get(permit.getGuardianId());
+ if (guardian != null) permit.setGuardian(guardian.getName());
+ });
+ }
+
+ /**
+ * 鎵归噺鍥炲~鐩戞姢璁板綍鐨勭洃鎶や汉鏈�鏂板鍚�
+ */
+ public void fillMonitorGuardians(List<SafetyWorkPermitMonitorDO> monitors) {
+ if (CollUtil.isEmpty(monitors)) {
+ return;
+ }
+ var employeeMap = refResolver.employeeMap(
+ monitors.stream().map(SafetyWorkPermitMonitorDO::getGuardianId).toList());
+ monitors.forEach(monitor -> {
+ var employee = employeeMap.get(monitor.getGuardianId());
+ if (employee != null) monitor.setGuardian(employee.getName());
+ });
+ }
+
+ public static void fillPermitDisplay(SafetyWorkPermitDO permit, SafetyWorkPermitRespVO respVO) {
+ respVO.setPermitTypeName(SafetyPermitTypeEnum.getNameByType(permit.getPermitType()));
+ respVO.setRiskLevelName(SafetyRiskLevelEnum.getNameByLevel(permit.getRiskLevel()));
+ respVO.setStatusName(SafetyPermitStatusEnum.getNameByStatus(permit.getStatus()));
+ respVO.setGuardianRequired(SafetyPermitTypeEnum.requiresGuardian(permit.getPermitType()));
+ }
+
+ private void validateTimeRange(SafetyWorkPermitSaveReqVO reqVO) {
+ if (reqVO.getPlanStartTime() != null && reqVO.getPlanEndTime() != null
+ && !reqVO.getPlanEndTime().isAfter(reqVO.getPlanStartTime())) {
+ throw exception(SAFETY_PERMIT_TIME_INVALID);
+ }
+ }
+
+ private void ensureStatus(SafetyWorkPermitDO permit, SafetyPermitStatusEnum... allowed) {
+ for (SafetyPermitStatusEnum status : allowed) {
+ if (status.getStatus().equals(permit.getStatus())) {
+ return;
+ }
+ }
+ throw exception(SAFETY_PERMIT_STATUS_ERROR);
+ }
+
+ private SafetyWorkPermitDO validatePermitExists(Long id) {
+ SafetyWorkPermitDO permit = id == null ? null : permitMapper.selectById(id);
+ if (permit == null) {
+ throw exception(SAFETY_PERMIT_NOT_EXISTS);
+ }
+ return permit;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueLineServiceImpl.java
index 4ed4684..0485b38 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueLineServiceImpl.java
@@ -6,6 +6,8 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.line.MesWmProductIssueLinePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.line.MesWmProductIssueLineSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderBomDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
+import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productissue.MesWmProductIssueDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productissue.MesWmProductIssueLineDO;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.productissue.MesWmProductIssueLineMapper;
@@ -17,6 +19,7 @@
import org.springframework.validation.annotation.Validated;
import java.util.List;
+import java.util.Objects;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_PRODUCT_ISSUE_LINE_ITEM_NOT_IN_BOM;
@@ -39,6 +42,8 @@
private MesMdmItemService mdmItemService;
@Resource
private MesProWorkOrderBomService workOrderBomService;
+ @Resource
+ private MesProTaskService taskService;
@Resource
@Lazy
private MesWmProductIssueDetailService issueDetailService;
@@ -120,6 +125,17 @@
private void validateItemInWorkOrderBom(Long issueId, Long itemId) {
// 鏍¢獙棰嗘枡鍗曞瓨鍦紝骞惰幏鍙栧伐鍗曠紪鍙�
MesWmProductIssueDO issue = issueService.validateProductIssueExists(issueId);
+ if (issue.getTaskId() != null) {
+ MesProTaskDO task = taskService.validateTaskExists(issue.getTaskId());
+ if (task.getWorkOrderId() == null || task.getProcessId() == null
+ || !Objects.equals(issue.getWorkOrderId(), task.getWorkOrderId())
+ || workOrderBomService.getWorkOrderBomListByWorkOrderId(task.getWorkOrderId()).stream()
+ .noneMatch(bom -> Objects.equals(bom.getProcessId(), task.getProcessId())
+ && Objects.equals(bom.getItemId(), itemId))) {
+ throw exception(WM_PRODUCT_ISSUE_LINE_ITEM_NOT_IN_BOM);
+ }
+ return;
+ }
// 鏍¢獙鐗╂枡鏄惁鍦ㄥ伐鍗� BOM 涓紙闃查敊鏂欙級
List<MesProWorkOrderBomDO> workOrderBoms = workOrderBomService.getWorkOrderBomListByWorkOrderId(issue.getWorkOrderId());
if (CollUtil.isEmpty(workOrderBoms)) {
diff --git a/yudao-module-mes/src/main/resources/mapper/qc/ledger/MesQcInspectionLedgerMapper.xml b/yudao-module-mes/src/main/resources/mapper/qc/ledger/MesQcInspectionLedgerMapper.xml
new file mode 100644
index 0000000..0637be5
--- /dev/null
+++ b/yudao-module-mes/src/main/resources/mapper/qc/ledger/MesQcInspectionLedgerMapper.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.mes.dal.mysql.qc.ledger.MesQcInspectionLedgerMapper">
+
+ <!--
+ 妫�娴嬬粨鏋滃彴璐︽煡璇紙鍥涚被妫�楠屽崟 UNION ALL锛�
+ 涓�琛� = 涓�涓娴嬮」缁撴灉锛涙楠屽崟鏈綍鍏ユ楠岀粨鏋滄椂璇ュ崟鍗犱竴琛岋紝妫�娴嬮」鐩稿叧鍒椾负绌猴紙LEFT JOIN 淇濊瘉涓嶄涪鍗曪級銆�
+ 璇存槑锛氭楠岀粨鏋滅殑鍏宠仈閿负 (qc_id, qc_type)锛宷c_id 涓哄悇妫�楠屽崟鑷韩鐨� id锛岄渶鎸夌被鍨嬭繃婊� qc_type锛屽惁鍒欎笉鍚岀被鍨嬬殑 id 浼氫覆鍗曘��
+ 璇存槑锛氭娴嬮」鍚嶇О涓嶅仛閫昏緫鍒犻櫎杩囨护锛屽凡鍋滅敤/鍒犻櫎鐨勬娴嬮」浠嶅睍绀哄巻鍙插彴璐﹀悕绉般��
+ -->
+ <select id="selectInspectionLedgerPage" resultType="cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo.MesQcInspectionLedgerRespVO">
+ SELECT * FROM (
+ <!-- 1. 鏉ユ枡妫�楠岋紙IQC锛夛紝鎵规鍙栦緵搴斿晢鎵规鍙� -->
+ SELECT
+ ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@IQC.type} AS qcType,
+ q.id AS qcId,
+ q.code AS code,
+ q.name AS name,
+ q.status AS status,
+ q.item_id AS itemId,
+ q.vendor_batch AS batchNo,
+ q.check_quantity AS checkQuantity,
+ q.qualified_quantity AS qualifiedQuantity,
+ q.unqualified_quantity AS unqualifiedQuantity,
+ q.check_result AS checkResult,
+ q.inspect_date AS inspectDate,
+ q.inspector_user_id AS inspectorUserId,
+ q.remark AS remark,
+ d.indicator_id AS indicatorId,
+ i.name AS indicatorName,
+ d.value AS indicatorValue,
+ d.remark AS indicatorRemark,
+ l.standard_value AS standardValue,
+ l.min_threshold AS minThreshold,
+ l.max_threshold AS maxThreshold
+ FROM mes_qc_iqc q
+ LEFT JOIN mes_qc_indicator_result r ON r.qc_id = q.id
+ AND r.qc_type = ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@IQC.type}
+ AND r.deleted = 0
+ LEFT JOIN mes_qc_indicator_result_detail d ON d.result_id = r.id AND d.deleted = 0
+ LEFT JOIN mes_qc_indicator i ON i.id = d.indicator_id
+ LEFT JOIN mes_qc_iqc_line l ON l.iqc_id = q.id AND l.indicator_id = d.indicator_id AND l.deleted = 0
+ WHERE q.deleted = 0
+
+ UNION ALL
+
+ <!-- 2. 杩囩▼妫�楠岋紙IPQC锛夛紝鏃犳壒娆″彿 -->
+ SELECT
+ ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@IPQC.type} AS qcType,
+ q.id AS qcId,
+ q.code AS code,
+ q.name AS name,
+ q.status AS status,
+ q.item_id AS itemId,
+ NULL AS batchNo,
+ q.check_quantity AS checkQuantity,
+ q.qualified_quantity AS qualifiedQuantity,
+ q.unqualified_quantity AS unqualifiedQuantity,
+ q.check_result AS checkResult,
+ q.inspect_date AS inspectDate,
+ q.inspector_user_id AS inspectorUserId,
+ q.remark AS remark,
+ d.indicator_id AS indicatorId,
+ i.name AS indicatorName,
+ d.value AS indicatorValue,
+ d.remark AS indicatorRemark,
+ l.standard_value AS standardValue,
+ l.min_threshold AS minThreshold,
+ l.max_threshold AS maxThreshold
+ FROM mes_qc_ipqc q
+ LEFT JOIN mes_qc_indicator_result r ON r.qc_id = q.id
+ AND r.qc_type = ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@IPQC.type}
+ AND r.deleted = 0
+ LEFT JOIN mes_qc_indicator_result_detail d ON d.result_id = r.id AND d.deleted = 0
+ LEFT JOIN mes_qc_indicator i ON i.id = d.indicator_id
+ LEFT JOIN mes_qc_ipqc_line l ON l.ipqc_id = q.id AND l.indicator_id = d.indicator_id AND l.deleted = 0
+ WHERE q.deleted = 0
+
+ UNION ALL
+
+ <!-- 3. 鍑鸿揣妫�楠岋紙OQC锛夛紝鎵规鍙栨壒娆″彿 -->
+ SELECT
+ ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@OQC.type} AS qcType,
+ q.id AS qcId,
+ q.code AS code,
+ q.name AS name,
+ q.status AS status,
+ q.item_id AS itemId,
+ q.batch_code AS batchNo,
+ q.check_quantity AS checkQuantity,
+ q.qualified_quantity AS qualifiedQuantity,
+ q.unqualified_quantity AS unqualifiedQuantity,
+ q.check_result AS checkResult,
+ q.inspect_date AS inspectDate,
+ q.inspector_user_id AS inspectorUserId,
+ q.remark AS remark,
+ d.indicator_id AS indicatorId,
+ i.name AS indicatorName,
+ d.value AS indicatorValue,
+ d.remark AS indicatorRemark,
+ l.standard_value AS standardValue,
+ l.min_threshold AS minThreshold,
+ l.max_threshold AS maxThreshold
+ FROM mes_qc_oqc q
+ LEFT JOIN mes_qc_indicator_result r ON r.qc_id = q.id
+ AND r.qc_type = ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@OQC.type}
+ AND r.deleted = 0
+ LEFT JOIN mes_qc_indicator_result_detail d ON d.result_id = r.id AND d.deleted = 0
+ LEFT JOIN mes_qc_indicator i ON i.id = d.indicator_id
+ LEFT JOIN mes_qc_oqc_line l ON l.oqc_id = q.id AND l.indicator_id = d.indicator_id AND l.deleted = 0
+ WHERE q.deleted = 0
+
+ UNION ALL
+
+ <!-- 4. 閫�璐ф楠岋紙RQC锛夛紝鎵规鍙栨壒娆″彿 -->
+ SELECT
+ ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@RQC.type} AS qcType,
+ q.id AS qcId,
+ q.code AS code,
+ q.name AS name,
+ q.status AS status,
+ q.item_id AS itemId,
+ q.batch_code AS batchNo,
+ q.check_quantity AS checkQuantity,
+ q.qualified_quantity AS qualifiedQuantity,
+ q.unqualified_quantity AS unqualifiedQuantity,
+ q.check_result AS checkResult,
+ q.inspect_date AS inspectDate,
+ q.inspector_user_id AS inspectorUserId,
+ q.remark AS remark,
+ d.indicator_id AS indicatorId,
+ i.name AS indicatorName,
+ d.value AS indicatorValue,
+ d.remark AS indicatorRemark,
+ l.standard_value AS standardValue,
+ l.min_threshold AS minThreshold,
+ l.max_threshold AS maxThreshold
+ FROM mes_qc_rqc q
+ LEFT JOIN mes_qc_indicator_result r ON r.qc_id = q.id
+ AND r.qc_type = ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@RQC.type}
+ AND r.deleted = 0
+ LEFT JOIN mes_qc_indicator_result_detail d ON d.result_id = r.id AND d.deleted = 0
+ LEFT JOIN mes_qc_indicator i ON i.id = d.indicator_id
+ LEFT JOIN mes_qc_rqc_line l ON l.rqc_id = q.id AND l.indicator_id = d.indicator_id AND l.deleted = 0
+ WHERE q.deleted = 0
+ ) t
+ <where>
+ <if test="reqVO.qcType != null">
+ AND t.qcType = #{reqVO.qcType}
+ </if>
+ <if test="reqVO.inspectDate != null and reqVO.inspectDate.length > 0 and reqVO.inspectDate[0] != null">
+ AND t.inspectDate >= #{reqVO.inspectDate[0]}
+ </if>
+ <if test="reqVO.inspectDate != null and reqVO.inspectDate.length > 1 and reqVO.inspectDate[1] != null">
+ AND t.inspectDate <= #{reqVO.inspectDate[1]}
+ </if>
+ <if test="reqVO.code != null and reqVO.code != ''">
+ AND t.code LIKE CONCAT('%', #{reqVO.code}, '%')
+ </if>
+ <if test="reqVO.itemId != null">
+ AND t.itemId = #{reqVO.itemId}
+ </if>
+ <if test="reqVO.batchNo != null and reqVO.batchNo != ''">
+ AND t.batchNo LIKE CONCAT('%', #{reqVO.batchNo}, '%')
+ </if>
+ <if test="reqVO.checkResult != null">
+ AND t.checkResult = #{reqVO.checkResult}
+ </if>
+ <if test="reqVO.inspectorUserId != null">
+ AND t.inspectorUserId = #{reqVO.inspectorUserId}
+ </if>
+ </where>
+ ORDER BY t.inspectDate DESC, t.qcId DESC, t.qcType ASC
+ </select>
+
+</mapper>
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/certificate/SrmSupplierCertificateController.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/certificate/SrmSupplierCertificateController.java
index efc8520..ef1a687 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/certificate/SrmSupplierCertificateController.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/certificate/SrmSupplierCertificateController.java
@@ -117,7 +117,7 @@
.remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "璧勮川璇佷功瀵煎叆妯℃澘.xls", "璧勮川璇佷功鍒楄〃", SrmSupplierCertificateImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "璧勮川璇佷功瀵煎叆妯℃澘.xls", "璧勮川璇佷功鍒楄〃", SrmSupplierCertificateImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/PermissionController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/PermissionController.java
index 147ce82..0232e40 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/PermissionController.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/PermissionController.java
@@ -34,7 +34,10 @@
@Parameter(name = "roleId", description = "瑙掕壊缂栧彿", required = true)
@GetMapping("/list-role-menus")
@PreAuthorize("@ss.hasPermission('system:permission:assign-role-menu')")
- public CommonResult<Set<Long>> getRoleMenuList(Long roleId) {
+ public CommonResult<Set<Long>> getRoleMenuList(@RequestParam("roleId") Long roleId) {
+ // 鏄惧紡澹版槑蹇呭~锛歳oleId 缂哄け鏃剁敱 Spring 杩斿洖 400銆岃姹傚弬鏁颁笉姝g‘銆嶏紝
+ // 鑰屼笉鏄紶鍒� RoleServiceImpl 鐢� null 浣滀负缂撳瓨 key锛屾姏
+ // IllegalArgumentException: Null key returned for cache operation 鍙樻垚 500
return success(permissionService.getRoleMenuListByRoleId(roleId));
}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
index c89d3a3..22479fa 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
@@ -14,6 +14,7 @@
import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO;
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
import cn.iocoder.yudao.module.system.enums.common.SexEnum;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
import cn.iocoder.yudao.module.system.service.dept.DeptService;
import cn.iocoder.yudao.module.system.service.permission.PermissionService;
import cn.iocoder.yudao.module.system.service.permission.RoleService;
@@ -210,17 +211,23 @@
}
@GetMapping("/get-import-template")
- @Operation(summary = "鑾峰緱瀵煎叆鐢ㄦ埛妯℃澘")
+ @Operation(summary = "鑾峰緱瀵煎叆鐢ㄦ埛妯℃澘", description = "閮ㄩ棬鎸夐儴闂ㄥ悕绉板~鍐欙紝绀轰緥鍙栬嚜褰撳墠绯荤粺鐪熷疄閮ㄩ棬")
public void importTemplate(HttpServletResponse response) throws IOException {
- // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ // 绀轰緥鍙栧綋鍓嶇湡瀹為儴闂ㄥ悕绉帮紝閬垮厤浣跨敤鑰呯収鎶勫畼鏂� demo 瀵艰嚧銆岄儴闂ㄤ笉瀛樺湪銆�
+ List<DeptDO> depts = deptService.getDeptList(new DeptListReqVO());
+ String sampleDept1 = CollUtil.isNotEmpty(depts) ? depts.get(0).getName() : "璇峰~鍐欓儴闂ㄥ悕绉�";
+ String sampleDept2 = depts.size() > 1 ? depts.get(1).getName() : sampleDept1;
+
List<UserImportExcelVO> list = Arrays.asList(
- UserImportExcelVO.builder().username("yunai").deptId(1L).email("yunai@iocoder.cn").mobile("15601691300")
- .nickname("瓒呯骇绠$悊鍛�").status(CommonStatusEnum.ENABLE.getStatus()).sex(SexEnum.MALE.getSex()).build(),
- UserImportExcelVO.builder().username("yuanma").deptId(2L).email("yuanma@iocoder.cn").mobile("15601701300")
- .nickname("婧愮爜").status(CommonStatusEnum.DISABLE.getStatus()).sex(SexEnum.FEMALE.getSex()).build()
+ UserImportExcelVO.builder().username("zhangsan").deptName(sampleDept1).email("zhangsan@example.com")
+ .mobile("13800000001").nickname("寮犱笁")
+ .status(CommonStatusEnum.ENABLE.getStatus()).sex(SexEnum.MALE.getSex()).build(),
+ UserImportExcelVO.builder().username("lisi").deptName(sampleDept2).email("lisi@example.com")
+ .mobile("13800000002").nickname("鏉庡洓")
+ .status(CommonStatusEnum.ENABLE.getStatus()).sex(SexEnum.FEMALE.getSex()).build()
);
- // 杈撳嚭
- ExcelUtils.write(response, "鐢ㄦ埛瀵煎叆妯℃澘.xls", "鐢ㄦ埛鍒楄〃", UserImportExcelVO.class, list);
+ // 鏃ユ湡鍒楁寜鏂囨湰杈撳嚭锛岄伩鍏嶆樉绀烘垚 Excel 搴忓垪鍙�
+ ExcelUtils.writeTemplate(response, "鐢ㄦ埛瀵煎叆妯℃澘.xls", "鐢ㄦ埛鍒楄〃", UserImportExcelVO.class, list);
}
@PostMapping("/import")
@@ -232,6 +239,7 @@
@PreAuthorize("@ss.hasPermission('system:user:import')")
public CommonResult<UserImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
@RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport) throws Exception {
+ // 绌烘枃浠� / 鍧忔枃浠� / 妯℃澘涓嶅尮閰嶇瓑锛孍xcelUtils.read 宸茬粺涓�杞崲涓哄彲璇荤殑涓枃鎻愮ず
List<UserImportExcelVO> list = ExcelUtils.read(file, UserImportExcelVO.class);
return success(userService.importUserList(list, updateSupport));
}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java
index e5c792b..eb24978 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java
@@ -24,8 +24,8 @@
@ExcelProperty("鐢ㄦ埛鍚嶇О")
private String nickname;
- @ExcelProperty("閮ㄩ棬缂栧彿")
- private Long deptId;
+ @ExcelProperty("閮ㄩ棬鍚嶇О")
+ private String deptName;
@ExcelProperty("鐢ㄦ埛閭")
private String email;
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
index 0b0e91a..36421b3 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
@@ -47,6 +47,8 @@
ErrorCode USER_IS_DISABLE = new ErrorCode(1_002_003_006, "鍚嶅瓧涓恒�恵}銆戠殑鐢ㄦ埛宸茶绂佺敤");
ErrorCode USER_COUNT_MAX = new ErrorCode(1_002_003_008, "鍒涘缓鐢ㄦ埛澶辫触锛屽師鍥狅細瓒呰繃绉熸埛鏈�澶х鎴烽厤棰�({})锛�");
ErrorCode USER_IMPORT_INIT_PASSWORD = new ErrorCode(1_002_003_009, "鍒濆瀵嗙爜涓嶈兘涓虹┖");
+ ErrorCode USER_IMPORT_FILE_EMPTY = new ErrorCode(1_002_003_010, "璇烽�夋嫨瑕佸鍏ョ殑 Excel 鏂囦欢");
+ ErrorCode USER_IMPORT_FILE_INVALID = new ErrorCode(1_002_003_011, "Excel 鏂囦欢鏍煎紡涓嶆纭紝璇蜂笅杞芥渶鏂版ā鏉块噸鏂板~鍐�");
ErrorCode USER_MOBILE_NOT_EXISTS = new ErrorCode(1_002_003_010, "璇ユ墜鏈哄彿灏氭湭娉ㄥ唽");
ErrorCode USER_REGISTER_DISABLED = new ErrorCode(1_002_003_011, "娉ㄥ唽鍔熻兘宸插叧闂�");
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageRecordTypeEnum.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageRecordTypeEnum.java
index 0806302..dd3126d 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageRecordTypeEnum.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageRecordTypeEnum.java
@@ -22,6 +22,7 @@
// ===== 璐ㄦ =====
QUALITY_INSPECT("quality_inspect", "璐ㄦ"),
+ MES_QC_PATROL("mes_qc_patrol", "宸℃"),
// ===== 璁惧 =====
DEVICE_MAINTENANCE("device_maintenance", "璁惧缁存姢"),
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
index 1098246..9b98bb5 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
@@ -14,6 +14,7 @@
import cn.iocoder.yudao.framework.datapermission.core.util.DataPermissionUtils;
import cn.iocoder.yudao.module.infra.api.config.ConfigApi;
import cn.iocoder.yudao.module.system.controller.admin.auth.vo.AuthRegisterReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserImportExcelVO;
@@ -581,6 +582,12 @@
}
// 1.2 绯荤粺鍙傛暟涓殑鍒濆瀵嗙爜锛屼綔涓� Excel 鏈~鍐欏瘑鐮佹椂鐨勫厹搴�
String initPassword = configApi.getConfigValueByKey(USER_INIT_PASSWORD_KEY);
+ // 1.3 棰勫姞杞介儴闂細鍚嶇О -> 閮ㄩ棬锛岀敤浜庢寜鍚嶇О瑙f瀽锛堟ā鏉胯姹傚~閮ㄩ棬鍚嶇О锛岃�岄潪鏁版嵁搴撲富閿� ID锛�
+ List<DeptDO> allDepts = deptService.getDeptList(new DeptListReqVO());
+ Map<String, DeptDO> deptByName = new HashMap<>(Math.max(allDepts.size(), 1));
+ for (DeptDO dept : allDepts) {
+ deptByName.put(dept.getName().trim(), dept);
+ }
// 2. 閬嶅巻锛岄�愪釜鍒涘缓 or 鏇存柊
UserImportRespVO respVO = UserImportRespVO.builder().createUsernames(new ArrayList<>())
@@ -589,6 +596,14 @@
importUsers.forEach(importUser -> {
int currentIndex = index.getAndIncrement();
String key = StrUtil.blankToDefault(importUser.getUsername(), "绗� " + currentIndex + " 琛�");
+ // 2.0 瑙f瀽閮ㄩ棬锛氭寜閮ㄩ棬鍚嶇О绮剧‘鍖归厤锛屽尮閰嶄笉鍒扮粰鍑烘槑纭彁绀猴紙涓嶅啀瑕佹眰濉暟鎹簱涓婚敭 ID锛�
+ DeptDO importDept = resolveImportDept(importUser.getDeptName(), deptByName);
+ if (importDept == null && StrUtil.isNotBlank(importUser.getDeptName())) {
+ respVO.getFailureUsernames().put(key,
+ "閮ㄩ棬銆�" + importUser.getDeptName().trim() + "銆嶄笉瀛樺湪锛岃濉啓閮ㄩ棬绠$悊涓殑瀹屾暣閮ㄩ棬鍚嶇О");
+ return;
+ }
+ Long importDeptId = importDept != null ? importDept.getId() : null;
// 2.1.0 瑙f瀽璇ヨ鍒濆瀵嗙爜锛欵xcel 濉啓浜嗗氨鐢ㄥ~鍐欑殑锛屽惁鍒欒鍙栫郴缁熷弬鏁�
String effectivePassword = StrUtil.isNotBlank(importUser.getPassword())
? importUser.getPassword() : initPassword;
@@ -600,7 +615,8 @@
}
// 2.1.1 鏍¢獙瀛楁鏄惁绗﹀悎瑕佹眰
try {
- ValidationUtils.validate(BeanUtils.toBean(importUser, UserSaveReqVO.class).setPassword(effectivePassword));
+ ValidationUtils.validate(BeanUtils.toBean(importUser, UserSaveReqVO.class)
+ .setPassword(effectivePassword).setDeptId(importDeptId));
} catch (ConstraintViolationException ex) {
respVO.getFailureUsernames().put(key, ex.getMessage());
return;
@@ -608,7 +624,7 @@
// 2.1.2 鏍¢獙锛屽垽鏂槸鍚︽湁涓嶇鍚堢殑鍘熷洜
try {
validateUserForCreateOrUpdate(null, null, importUser.getMobile(), importUser.getEmail(),
- importUser.getDeptId(), null);
+ importDeptId, null);
} catch (ServiceException ex) {
respVO.getFailureUsernames().put(importUser.getUsername(), ex.getMessage());
return;
@@ -618,6 +634,7 @@
AdminUserDO existUser = userMapper.selectByUsername(importUser.getUsername());
if (existUser == null) {
userMapper.insert(BeanUtils.toBean(importUser, AdminUserDO.class)
+ .setDeptId(importDeptId) // 閮ㄩ棬宸叉寜鍚嶇О瑙f瀽锛岄渶鏄惧紡鍥炲~ ID
.setPassword(encodePassword(effectivePassword)).setPostIds(new HashSet<>())); // 璁剧疆鍒濆瀵嗙爜鍙婄┖宀椾綅缂栧彿鏁扮粍
respVO.getCreateUsernames().add(importUser.getUsername());
return;
@@ -629,6 +646,7 @@
}
AdminUserDO updateUser = BeanUtils.toBean(importUser, AdminUserDO.class);
updateUser.setId(existUser.getId());
+ updateUser.setDeptId(importDeptId); // 閮ㄩ棬宸叉寜鍚嶇О瑙f瀽锛岄渶鏄惧紡鍥炲~ ID
// 瀵嗙爜鍗曠嫭澶勭悊锛欵xcel 濉啓浜嗘墠鏇存柊锛涙湭濉啓鍒欑疆绌猴紝淇濇寔鍘熷瘑鐮佷笉鍙橈紙閬垮厤鎶婃槑鏂囧啓杩涘簱锛�
updateUser.setPassword(StrUtil.isNotBlank(importUser.getPassword())
? encodePassword(importUser.getPassword()) : null);
@@ -638,6 +656,23 @@
return respVO;
}
+ /**
+ * 瑙f瀽瀵煎叆琛岄噷鐨勯儴闂ㄥ悕绉�
+ *
+ * <p>鍙寜閮ㄩ棬鍚嶇О绮剧‘鍖归厤锛堜笉鍐嶈姹傚~鍐欐暟鎹簱涓婚敭 ID锛夛紝
+ * 閬垮厤浣跨敤鑰呮棤浠庡緱鐭ラ儴闂� ID 瀵艰嚧瀵煎叆蹇呯劧澶辫触銆�</p>
+ *
+ * @param raw 瀵煎叆濉啓鐨勯儴闂ㄥ悕绉�
+ * @param byName 閮ㄩ棬鍚嶇О -> 閮ㄩ棬
+ * @return 鍖归厤鍒扮殑閮ㄩ棬锛涙湭濉啓鎴栧尮閰嶄笉鍒拌繑鍥� null
+ */
+ private DeptDO resolveImportDept(String raw, Map<String, DeptDO> byName) {
+ if (StrUtil.isBlank(raw)) {
+ return null;
+ }
+ return byName.get(raw.trim());
+ }
+
@Override
public List<AdminUserDO> getUserListByStatus(Integer status) {
return userMapper.selectListByStatus(status);
diff --git a/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java b/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java
index 68c8510..067579c 100644
--- a/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java
+++ b/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java
@@ -15,6 +15,7 @@
import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserImportRespVO;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserPageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserSaveReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.UserPostDO;
@@ -416,21 +417,22 @@
*/
@Test
public void testImportUserList_01() {
- // 鍑嗗鍙傛暟
+ // 鍑嗗鍙傛暟锛氶儴闂ㄥ悕绉板湪绯荤粺涓笉瀛樺湪
UserImportExcelVO importUser = randomPojo(UserImportExcelVO.class, o -> {
+ o.setDeptName("涓嶅瓨鍦ㄧ殑閮ㄩ棬-" + System.currentTimeMillis());
o.setEmail(randomEmail());
o.setMobile(randomMobile());
});
- // mock 鏂规硶锛屾ā鎷熷け璐�
- doThrow(new ServiceException(DEPT_NOT_FOUND)).when(deptService).validateDeptList(any());
+ // mock锛氱郴缁熶腑娌℃湁鍖归厤鐨勯儴闂�
+ when(deptService.getDeptList(any(DeptListReqVO.class))).thenReturn(newArrayList());
// 璋冪敤
UserImportRespVO respVO = userService.importUserList(newArrayList(importUser), true);
- // 鏂█
+ // 鏂█锛氳琛屽洜閮ㄩ棬涓嶅瓨鍦ㄨ�屽け璐�
assertEquals(0, respVO.getCreateUsernames().size());
assertEquals(0, respVO.getUpdateUsernames().size());
assertEquals(1, respVO.getFailureUsernames().size());
- assertEquals(DEPT_NOT_FOUND.getMsg(), respVO.getFailureUsernames().get(importUser.getUsername()));
+ assertTrue(respVO.getFailureUsernames().get(importUser.getUsername()).contains("涓嶅瓨鍦�"));
}
/**
@@ -446,10 +448,13 @@
o.setMobile(randomMobile());
});
// mock deptService 鐨勬柟娉�
+ // 閮ㄩ棬宸叉敼涓烘寜鍚嶇О瀵煎叆锛歮ock getDeptList 杩斿洖涓�涓彲鍖归厤鐨勯儴闂�
DeptDO dept = randomPojo(DeptDO.class, o -> {
- o.setId(importUser.getDeptId());
+ o.setId(1L);
+ o.setName(importUser.getDeptName());
o.setStatus(CommonStatusEnum.ENABLE.getStatus());
});
+ when(deptService.getDeptList(any(DeptListReqVO.class))).thenReturn(newArrayList(dept));
when(deptService.getDept(eq(dept.getId()))).thenReturn(dept);
// mock passwordEncoder 鐨勬柟娉�
when(passwordEncoder.encode(eq("yudaoyuanma"))).thenReturn("java");
@@ -481,11 +486,13 @@
o.setEmail(randomEmail());
o.setMobile(randomMobile());
});
- // mock deptService 鐨勬柟娉�
+ // 閮ㄩ棬宸叉敼涓烘寜鍚嶇О瀵煎叆锛歮ock getDeptList 杩斿洖涓�涓彲鍖归厤鐨勯儴闂�
DeptDO dept = randomPojo(DeptDO.class, o -> {
- o.setId(importUser.getDeptId());
+ o.setId(1L);
+ o.setName(importUser.getDeptName());
o.setStatus(CommonStatusEnum.ENABLE.getStatus());
});
+ when(deptService.getDeptList(any(DeptListReqVO.class))).thenReturn(newArrayList(dept));
when(deptService.getDept(eq(dept.getId()))).thenReturn(dept);
// 璋冪敤
@@ -513,11 +520,13 @@
o.setEmail(randomEmail());
o.setMobile(randomMobile());
});
- // mock deptService 鐨勬柟娉�
+ // 閮ㄩ棬宸叉敼涓烘寜鍚嶇О瀵煎叆锛歮ock getDeptList 杩斿洖涓�涓彲鍖归厤鐨勯儴闂�
DeptDO dept = randomPojo(DeptDO.class, o -> {
- o.setId(importUser.getDeptId());
+ o.setId(1L);
+ o.setName(importUser.getDeptName());
o.setStatus(CommonStatusEnum.ENABLE.getStatus());
});
+ when(deptService.getDeptList(any(DeptListReqVO.class))).thenReturn(newArrayList(dept));
when(deptService.getDept(eq(dept.getId()))).thenReturn(dept);
// 璋冪敤
--
Gitblit v1.9.3