From 234b0ac195934b34c06045b2d2ef0f10e239dd8e Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期三, 23 四月 2025 00:06:54 +0800
Subject: [PATCH] 系统合并
---
cnas-require/src/main/java/com/ruoyi/require/mapper/FeStandardSubstanceRecordMapper.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalMeetingDetail.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonJobResponsibilitiesService.java | 2
cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessDealMapper.java | 7
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java | 16
cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMetricRecordMapper.java | 2
cnas-process/src/main/java/com/ruoyi/process/mapper/InconsistentDistributionMapper.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/FeIlluminationDetectionAreaService.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIssueRecycleController.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/impl/FeTempHumDateServiceImpl.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentIssueRecycleMapper.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageControlPlanListService.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentListService.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordTotal.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonJobResponsibilitiesController.java | 2
ruoyi-framework/src/main/java/com/ruoyi/framework/web/ssoAuth/SsoCodeAuthenticationProvider.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageReviewProgramMapper.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonCommunicationAbility.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonRewardPunishmentRecordController.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonJobResponsibilitiesServiceImpl.java | 2
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessEvaluateController.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordIntervalsMapper.java | 2
cnas-process/src/main/java/com/ruoyi/process/service/ProcessComplainService.java | 2
cnas-require/src/main/java/com/ruoyi/require/mapper/InternalWastesMapper.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalPlanServiceImpl.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentIssueRecycleServiceImpl.java | 2
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java | 8
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsReportController.java | 14
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductDeviationWarningDetailMapper.java | 2
cnas-require/src/main/java/com/ruoyi/require/controller/FeCalibrationScheduleController.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsProductDeviationWarningController.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/InternalCorrectFileService.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsService.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductDeviationWarningDetailServiceImpl.java | 2
cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceImpowerDetails.java | 61
cnas-process/src/main/java/com/ruoyi/process/service/impl/InconsistentDistributionDetailServiceImpl.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewReportServiceImpl.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonRewardPunishmentRecordService.java | 2
cnas-require/src/main/java/com/ruoyi/require/pojo/ProcurementSuppliesList.java | 2
cnas-device/src/main/java/com/ruoyi/device/service/DeviceImpowerDetailsService.java | 16
cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessComplainMapper.java | 2
cnas-device/src/main/java/com/ruoyi/device/mapper/OperationInstructionMapper.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonPostAuthorizationRecordServiceImpl.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageMeetingServiceImpl.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/InternalWastesDetailService.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/impl/FeLightningProtectionServiceImpl.java | 2
cnas-require/src/main/java/com/ruoyi/require/pojo/FeTempHumDate.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentListMapper.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRiskAssessmentResultsController.java | 2
cnas-require/src/main/java/com/ruoyi/require/pojo/FeIlluminationDetectionArea.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/FeTempHumRecordService.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalPlanMapper.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceAcceptanceServiceImpl.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordIntervalsTotalMapper.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingParticipantsController.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonPersonnelCapacityService.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonRewardPunishmentRecordMapper.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/FeIlluminationService.java | 2
cnas-device/src/main/java/com/ruoyi/device/service/DeviceInstructionService.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordIntervalsTotal.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageReviewReportMapper.java | 2
cnas-require/src/main/java/com/ruoyi/require/controller/SuppliersDirectoryContentsController.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPostAuthorizationRecordController.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/FeCalibrationScheduleService.java | 2
ruoyi-system/src/main/resources/mapper/system/UserMapper.xml | 4
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentListController.java | 2
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessDealController.java | 20
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsReportMapper.java | 11
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageReviewProgramService.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageMeetingService.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonTrainingDetailed.java | 2
cnas-process/src/main/resources/mapper/ProcessDealMapper.xml | 13
ruoyi-common/src/main/java/com/ruoyi/common/constant/DeviceImpowerConstants.java | 65
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceOperationInstructionServiceImpl.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/impl/ProcurementSuppliesExpendsServiceImpl.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/impl/SuppliersDirectoryContentsServiceImpl.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/impl/InternalWastesServiceImpl.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageControlPlanListMapper.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRiskAssessmentResults.java | 2
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java | 388 +----
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java | 74
cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentCancelMapper.java | 2
cnas-require/src/main/java/com/ruoyi/require/mapper/SupplierManagementMapper.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonPersonnelCapacity.java | 2
cnas-process/src/main/java/com/ruoyi/process/service/InconsistentDistributionDetailService.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonPostAuthorizationRecordMapper.java | 2
cnas-require/src/main/java/com/ruoyi/require/pojo/FeCalibrationSchedule.java | 2
cnas-process/src/main/java/com/ruoyi/process/service/ProcessReportService.java | 5
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordAuditService.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageMeeting.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/InternalMeetingDetailService.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageReviewProgram.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentAlterServiceImpl.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/FePowerStableService.java | 2
cnas-process/src/main/resources/static/sample-receive.docx | 0
cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java | 15
cnas-process/src/main/java/com/ruoyi/process/pojo/InconsistentDistributionDetail.java | 2
cnas-require/src/main/java/com/ruoyi/require/pojo/FeLightningProtection.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java | 20
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCancelService.java | 2
cnas-device/src/main/java/com/ruoyi/device/pojo/OperationInstruction.java | 2
cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceAcceptance.java | 2
cnas-device/src/main/java/com/ruoyi/device/service/DeviceMetricRecordService.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingRecordServiceImpl.java | 2
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceInstructionServiceImpl.java | 2
cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessReportMapper.java | 2
basic-server/src/main/resources/mapper/StandardTreeMapper.xml | 9
inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductDeviationWarningService.java | 2
cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessTotaldeal.java | 17
cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageReviewProgramFileMapper.java | 2
cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessOrderDeviceMapper.java | 27
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessComplainServiceImpl.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java | 9
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordTotalServiceImpl.java | 2
cnas-require/src/main/java/com/ruoyi/require/pojo/InternalWastes.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentControlledMapper.java | 2
cnas-require/src/main/java/com/ruoyi/require/controller/ProcurementSuppliesExpendsController.java | 2
cnas-require/src/main/java/com/ruoyi/require/controller/FeLightningProtectionController.java | 2
cnas-device/src/main/resources/static/word/device-maintenance.docx | 0
cnas-process/src/main/java/com/ruoyi/process/service/ProcessOrderDeviceService.java | 19
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonTrainingRecord.java | 2
cnas-require/src/main/java/com/ruoyi/require/pojo/SuppliersDirectoryContents.java | 2
inspect-server/src/main/resources/mapper/InsReportMapper.xml | 70 +
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java | 2
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessEvaluateServiceImpl.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/impl/FeTempHumRecordServiceImpl.java | 2
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceStateServiceImpl.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordIssueRecycle.java | 2
cnas-require/src/main/java/com/ruoyi/require/pojo/FePowerStable.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/FeTempHumDateService.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordCheck.java | 2
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMetricRecordController.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCheckController.java | 2
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMetricRecordServiceImpl.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonJobResponsibilitiesMapper.java | 2
inspect-server/src/main/resources/mapper/InsProductResultMapper.xml | 3
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentControlledService.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonRewardPunishmentRecord.java | 2
cnas-process/src/main/java/com/ruoyi/process/service/ProcessEvaluateService.java | 2
cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessOrderDevice.java | 69 +
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIssueRecycleServiceImpl.java | 2
cnas-device/src/main/java/com/ruoyi/device/task/DeviceRecordSchedule.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalMeetingServiceImpl.java | 4
cnas-require/src/main/java/com/ruoyi/require/pojo/FeIllumination.java | 2
cnas-require/src/main/java/com/ruoyi/require/controller/ProcurementSuppliesListController.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalPlanDetailMapper.java | 2
cnas-device/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java | 20
cnas-require/src/main/java/com/ruoyi/require/mapper/FeMeasuredQuantityMapper.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceServiceImpl.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/FeMeasuredQuantityService.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentCancel.java | 2
cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessComplain.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalPlan.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsTotalService.java | 2
README.md | 95 -
cnas-require/src/main/java/com/ruoyi/require/task/FeTempHumDateSchedule.java | 8
cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonPersonnelCapacityMapper.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonCommunicationAbilityServiceImpl.java | 2
cnas-device/src/main/resources/mapper/DeviceImpowerMapper.xml | 14
cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingService.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentControlled.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalCorrectServiceImpl.java | 2
cnas-require/src/main/java/com/ruoyi/require/controller/SupplierManagementController.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentAlter.java | 2
cnas-require/src/main/java/com/ruoyi/require/mapper/FeStandardSubstanceAcceptanceMapper.java | 2
cnas-process/src/main/java/com/ruoyi/process/service/ProcessTotaldealService.java | 7
cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceInstruction.java | 2
cnas-require/src/main/java/com/ruoyi/require/controller/InternalWastesController.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordTotalController.java | 2
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessSampleServiceImpl.java | 93
cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessSample.java | 6
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonCommunicationAbilityController.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageMeetingParticipantsService.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageControlPlanList.java | 2
cnas-device/src/main/resources/mapper/DeviceBorrowMapper.xml | 4
cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonCommunicationAbilityMapper.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java | 3
cnas-device/src/main/java/com/ruoyi/device/service/DeviceOperationInstructionService.java | 2
cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstance.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java | 2
cnas-require/src/main/java/com/ruoyi/require/mapper/FePowerStableMapper.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordAuditServiceImpl.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/FeStandardSubstanceAcceptanceInspectionService.java | 2
cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceMetricRecord.java | 2
cnas-require/src/main/java/com/ruoyi/require/pojo/ForeignRegister.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentIssueRecycle.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordCancelMapper.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonCommunicationAbilityService.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordIntervals.java | 2
cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMetricsCopyMapper.java | 2
cnas-require/src/main/java/com/ruoyi/require/mapper/FeStandardSubstanceAcceptanceInspectionMapper.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageMeetingMapper.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/InternalPlanDetailService.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/dto/InsReportExport.java | 75 +
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessComplainController.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordAuditController.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageReviewReportService.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonTraining.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingRecordMapper.java | 2
cnas-process/src/main/java/com/ruoyi/process/task/QualitySuperviseSchedule.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/impl/ForeignRegisterServiceImpl.java | 2
cnas-process/src/main/resources/mapper/ProcessSampleMapper.xml | 1
cnas-device/src/main/java/com/ruoyi/device/dto/DeviceImpowerDto.java | 24
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalPlanDetailServiceImpl.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentControlledController.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonPostAuthorizationRecord.java | 2
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceImpl.java | 168 ++
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java | 2
cnas-device/src/main/java/com/ruoyi/device/service/DeviceMaintenanceService.java | 21
cnas-manage/src/main/java/com/ruoyi/manage/service/InternalPlanService.java | 2
cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceMetricsCopy.java | 2
cnas-process/src/main/java/com/ruoyi/process/service/ProcessSampleService.java | 9
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 121 +
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramController.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalMeetingDetailMapper.java | 2
cnas-require/src/main/java/com/ruoyi/require/mapper/FeStandardSubstanceMapper.java | 2
cnas-process/src/main/java/com/ruoyi/process/pojo/InconsistentDistribution.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalMeeting.java | 2
cnas-require/src/main/java/com/ruoyi/require/mapper/FeIlluminationDetectionAreaMapper.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/impl/ProcurementSuppliesListServiceImpl.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/impl/InternalWastesDetailServiceImpl.java | 2
cnas-process/src/main/resources/mapper/ProcessOrderDeviceMapper.xml | 52
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageMeetingParticipantsServiceImpl.java | 2
cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceRecordController.java | 2
cnas-require/src/main/java/com/ruoyi/require/mapper/FeTempHumDateMapper.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalCorrectMapper.java | 2
cnas-require/src/main/java/com/ruoyi/require/mapper/FeLightningProtectionMapper.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalMeetingMapper.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewProgramServiceImpl.java | 2
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMetricsCopyServiceImpl.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/schedule/ManageRecordTotalSchedule.java | 2
cnas-process/src/main/resources/static/report-deal.docx | 0
cnas-require/src/main/java/com/ruoyi/require/service/FeStandardSubstanceRecordService.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordIssueRecycleMapper.java | 2
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessSampleController.java | 22
cnas-require/src/main/java/com/ruoyi/require/mapper/ProcurementSuppliesExpendsMapper.java | 2
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceImpowerDetailsServiceImpl.java | 20
cnas-require/src/main/java/com/ruoyi/require/service/FeLightningProtectionService.java | 2
cnas-require/src/main/java/com/ruoyi/require/mapper/ProcurementSuppliesListMapper.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarningDetail.java | 2
cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessTotaldealMapper.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordVerify.java | 2
cnas-require/src/main/java/com/ruoyi/require/mapper/FeTempHumRecordMapper.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsTotalServiceImpl.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/impl/FeIlluminationServiceImpl.java | 2
cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessDeal.java | 9
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsController.java | 2
cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java | 75
cnas-process/src/main/java/com/ruoyi/process/service/InconsistentDistributionService.java | 2
cnas-device/src/main/resources/static/word/device-impower.docx | 0
cnas-process/src/main/java/com/ruoyi/process/controller/InconsistentDistributionController.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/SupplierManagementService.java | 2
cnas-require/src/main/java/com/ruoyi/require/mapper/InternalWastesDetailMapper.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalCorrect.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordVerifyController.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordVerifyMapper.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIssueRecycleService.java | 2
cnas-require/src/main/java/com/ruoyi/require/controller/FePowerStableController.java | 2
cnas-require/src/main/java/com/ruoyi/require/controller/FeIlluminationController.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingMapper.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonPostAuthorizationRecordService.java | 2
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java | 8
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsTotalController.java | 2
cnas-require/src/main/java/com/ruoyi/require/mapper/ForeignRegisterMapper.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarning.java | 2
cnas-require/src/main/java/com/ruoyi/require/controller/FeTempHumDateController.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageMeetingParticipantsMapper.java | 2
cnas-require/src/main/java/com/ruoyi/require/pojo/ProcurementSuppliesExpends.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewProgramFileServiceImpl.java | 2
cnas-device/src/main/java/com/ruoyi/device/mapper/InstructionMapper.java | 2
cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessReport.java | 8
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRiskAssessmentResultsService.java | 2
cnas-require/src/main/java/com/ruoyi/require/pojo/SupplierManagement.java | 2
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java | 7
cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceAcceptanceInspection.java | 2
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceImpowerController.java | 108 +
cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceState.java | 2
cnas-process/src/main/java/com/ruoyi/process/mapper/InspectionOrderMapper.java | 4
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentCancelController.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageReviewReport.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingController.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/task/PersonTrainingSchedule.java | 2
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessOrderDeviceController.java | 64
cnas-require/src/main/java/com/ruoyi/require/service/impl/FeMeasuredQuantityServiceImpl.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPersonnelCapacityController.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingDetailedService.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageReviewProgramFile.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRiskAssessmentResultsMapper.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/InternalMeetingService.java | 2
cnas-process/src/main/resources/static/sample-deal.docx | 0
cnas-require/src/main/java/com/ruoyi/require/service/impl/FePowerStableServiceImpl.java | 2
cnas-device/src/main/java/com/ruoyi/device/service/DeviceMetricsCopyService.java | 2
basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java | 3
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotaldealController.java | 16
cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordCheckMapper.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentCancelService.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java | 2
cnas-device/src/main/java/com/ruoyi/device/service/DeviceStateService.java | 2
cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessEvaluate.java | 2
cnas-process/src/main/java/com/ruoyi/process/service/impl/InconsistentDistributionServiceImpl.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordTotalService.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonJobResponsibilities.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentAlterMapper.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentListServiceImpl.java | 2
cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceImpowerDetailsMapper.java | 26
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceImpowerServiceImpl.java | 299 ++++
cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordTotalMapper.java | 2
cnas-require/src/main/java/com/ruoyi/require/pojo/InternalWastesDetail.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCheckServiceImpl.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordVerifyService.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageControlPlanListController.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewReportController.java | 2
cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceImpowerMapper.java | 36
cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentList.java | 2
cnas-device/src/main/resources/mapper/DeviceImpowerDetailsMapper.xml | 16
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentAlterController.java | 2
cnas-require/src/main/java/com/ruoyi/require/controller/ForeignRegisterController.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java | 50
cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingDetailedMapper.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/ForeignRegisterService.java | 2
cnas-device/src/main/java/com/ruoyi/device/dto/DeviceImpowerDetailsDto.java | 25
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsServiceImpl.java | 2
cnas-device/src/main/resources/mapper/DeviceMaintenanceMapper.xml | 14
cnas-require/src/main/java/com/ruoyi/require/pojo/FeMeasuredQuantity.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingDetailedServiceImpl.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordAudit.java | 2
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceStateController.java | 2
cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java | 146 ++
cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageMeetingParticipants.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 23
cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalPlanDetail.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageReviewProgramFileService.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordAuditMapper.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/InternalWastesService.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductDeviationWarningMapper.java | 2
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java | 77 -
cnas-process/src/main/java/com/ruoyi/process/mapper/InconsistentDistributionDetailMapper.java | 2
cnas-require/src/main/java/com/ruoyi/require/mapper/FeCalibrationScheduleMapper.java | 2
cnas-process/src/main/resources/mapper/ProcessReportMapper.xml | 3
cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceRecord.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentCancelServiceImpl.java | 2
cnas-require/src/main/java/com/ruoyi/require/pojo/FeTempHumRecord.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonRewardPunishmentRecordServiceImpl.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceRecordServiceImpl.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonPersonnelCapacityServiceImpl.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentIssueRecycleService.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/impl/SupplierManagementServiceImpl.java | 2
cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessSampleMapper.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/SuppliersDirectoryContentsService.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 7
cnas-process/src/main/resources/mapper/InspectionOrderMapper.xml | 1
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCheckService.java | 2
cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceAcceptanceController.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/FeStandardSubstanceAcceptanceService.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordVerifyServiceImpl.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramFileController.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordCancel.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalMeetingDetailServiceImpl.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageControlPlanListServiceImpl.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCancelServiceImpl.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingRecordService.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/FeStandardSubstanceService.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingRecordController.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentControlledServiceImpl.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/impl/FeCalibrationScheduleServiceImpl.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductDeviationWarningServiceImpl.java | 2
cnas-device/src/main/resources/mapper/DeviceTraceabilityManagementDetailsMapper.xml | 1
cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalCorrectFileMapper.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductDeviationWarningDetailService.java | 2
cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceImpower.java | 75 +
cnas-require/src/main/java/com/ruoyi/require/mapper/SuppliersDirectoryContentsMapper.java | 2
cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceController.java | 2
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessOrderDeviceServiceImpl.java | 26
cnas-device/src/main/java/com/ruoyi/device/service/DeviceImpowerService.java | 71 +
cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalCorrectFile.java | 2
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessReportServiceImpl.java | 377 -----
cnas-process/src/main/resources/mapper/ProcessTotaldealMapper.xml | 5
cnas-manage/src/main/java/com/ruoyi/manage/service/InternalCorrectService.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceAcceptanceInspectionServiceImpl.java | 2
cnas-require/src/main/java/com/ruoyi/require/service/ProcurementSuppliesListService.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalCorrectFileServiceImpl.java | 2
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java | 15
cnas-require/src/main/java/com/ruoyi/require/service/impl/FeIlluminationDetectionAreaServiceImpl.java | 2
cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceStateMapper.java | 2
/dev/null | 35
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceInstructionController.java | 2
cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessEvaluateMapper.java | 2
cnas-process/src/main/java/com/ruoyi/process/service/ProcessDealService.java | 10
cnas-require/src/main/java/com/ruoyi/require/service/ProcurementSuppliesExpendsService.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentAlterService.java | 2
cnas-require/src/main/java/com/ruoyi/require/mapper/FeIlluminationMapper.java | 2
395 files changed, 2,497 insertions(+), 1,498 deletions(-)
diff --git a/README.md b/README.md
index 058fd43..e69de29 100644
--- a/README.md
+++ b/README.md
@@ -1,95 +0,0 @@
-<p align="center">
- <img alt="logo" src="https://oscimg.oschina.net/oscnet/up-d3d0a9303e11d522a06cd263f3079027715.png">
-</p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.8.9</h1>
-<h4 align="center">鍩轰簬SpringBoot+Vue鍓嶅悗绔垎绂荤殑Java蹇�熷紑鍙戞鏋�</h4>
-<p align="center">
- <a href="https://gitee.com/y_project/RuoYi-Vue/stargazers"><img src="https://gitee.com/y_project/RuoYi-Vue/badge/star.svg?theme=dark"></a>
- <a href="https://gitee.com/y_project/RuoYi-Vue"><img src="https://img.shields.io/badge/RuoYi-v3.8.9-brightgreen.svg"></a>
- <a href="https://gitee.com/y_project/RuoYi-Vue/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
-</p>
-
-## 骞冲彴绠�浠�
-
-鑻ヤ緷鏄竴濂楀叏閮ㄥ紑婧愮殑蹇�熷紑鍙戝钩鍙帮紝姣棤淇濈暀缁欎釜浜哄強浼佷笟鍏嶈垂浣跨敤銆�
-
-* 鍓嶇閲囩敤Vue銆丒lement UI銆�
-* 鍚庣閲囩敤Spring Boot銆丼pring Security銆丷edis & Jwt銆�
-* 鏉冮檺璁よ瘉浣跨敤Jwt锛屾敮鎸佸缁堢璁よ瘉绯荤粺銆�
-* 鏀寔鍔犺浇鍔ㄦ�佹潈闄愯彍鍗曪紝澶氭柟寮忚交鏉炬潈闄愭帶鍒躲��
-* 楂樻晥鐜囧紑鍙戯紝浣跨敤浠ｇ爜鐢熸垚鍣ㄥ彲浠ヤ竴閿敓鎴愬墠鍚庣浠ｇ爜銆�
-* 鎻愪緵浜嗘妧鏈爤锛圼Vue3](https://v3.cn.vuejs.org) [Element Plus](https://element-plus.org/zh-CN) [Vite](https://cn.vitejs.dev)锛夌増鏈琜RuoYi-Vue3](https://gitcode.com/yangzongzhuan/RuoYi-Vue3)锛屼繚鎸佸悓姝ユ洿鏂般��
-* 鎻愪緵浜嗗崟搴旂敤鐗堟湰[RuoYi-Vue-fast](https://gitcode.com/yangzongzhuan/RuoYi-Vue-fast)锛孫racle鐗堟湰[RuoYi-Vue-Oracle](https://gitcode.com/yangzongzhuan/RuoYi-Vue-Oracle)锛屼繚鎸佸悓姝ユ洿鏂般��
-* 涓嶅垎绂荤増鏈紝璇风Щ姝RuoYi](https://gitee.com/y_project/RuoYi)锛屽井鏈嶅姟鐗堟湰锛岃绉绘[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud)
-* 闃块噷浜戞姌鎵ｅ満锛歔鐐规垜杩涘叆](http://aly.ruoyi.vip)锛岃吘璁簯绉掓潃鍦猴細[鐐规垜杩涘叆](http://txy.ruoyi.vip)
-
-## 鍐呯疆鍔熻兘
-
-1. 鐢ㄦ埛绠＄悊锛氱敤鎴锋槸绯荤粺鎿嶄綔鑰咃紝璇ュ姛鑳戒富瑕佸畬鎴愮郴缁熺敤鎴烽厤缃��
-2. 閮ㄩ棬绠＄悊锛氶厤缃郴缁熺粍缁囨満鏋勶紙鍏徃銆侀儴闂ㄣ�佸皬缁勶級锛屾爲缁撴瀯灞曠幇鏀寔鏁版嵁鏉冮檺銆�
-3. 宀椾綅绠＄悊锛氶厤缃郴缁熺敤鎴锋墍灞炴媴浠昏亴鍔°��
-4. 鑿滃崟绠＄悊锛氶厤缃郴缁熻彍鍗曪紝鎿嶄綔鏉冮檺锛屾寜閽潈闄愭爣璇嗙瓑銆�
-5. 瑙掕壊绠＄悊锛氳鑹茶彍鍗曟潈闄愬垎閰嶃�佽缃鑹叉寜鏈烘瀯杩涜鏁版嵁鑼冨洿鏉冮檺鍒掑垎銆�
-6. 瀛楀吀绠＄悊锛氬绯荤粺涓粡甯镐娇鐢ㄧ殑涓�浜涜緝涓哄浐瀹氱殑鏁版嵁杩涜缁存姢銆�
-7. 鍙傛暟绠＄悊锛氬绯荤粺鍔ㄦ�侀厤缃父鐢ㄥ弬鏁般��
-8. 閫氱煡鍏憡锛氱郴缁熼�氱煡鍏憡淇℃伅鍙戝竷缁存姢銆�
-9. 鎿嶄綔鏃ュ織锛氱郴缁熸甯告搷浣滄棩蹇楄褰曞拰鏌ヨ锛涚郴缁熷紓甯镐俊鎭棩蹇楄褰曞拰鏌ヨ銆�
-10. 鐧诲綍鏃ュ織锛氱郴缁熺櫥褰曟棩蹇楄褰曟煡璇㈠寘鍚櫥褰曞紓甯搞��
-11. 鍦ㄧ嚎鐢ㄦ埛锛氬綋鍓嶇郴缁熶腑娲昏穬鐢ㄦ埛鐘舵�佺洃鎺с��
-12. 瀹氭椂浠诲姟锛氬湪绾匡紙娣诲姞銆佷慨鏀广�佸垹闄�)浠诲姟璋冨害鍖呭惈鎵ц缁撴灉鏃ュ織銆�
-13. 浠ｇ爜鐢熸垚锛氬墠鍚庣浠ｇ爜鐨勭敓鎴愶紙java銆乭tml銆亁ml銆乻ql锛夋敮鎸丆RUD涓嬭浇 銆�
-14. 绯荤粺鎺ュ彛锛氭牴鎹笟鍔′唬鐮佽嚜鍔ㄧ敓鎴愮浉鍏崇殑api鎺ュ彛鏂囨。銆�
-15. 鏈嶅姟鐩戞帶锛氱洃瑙嗗綋鍓嶇郴缁烠PU銆佸唴瀛樸�佺鐩樸�佸爢鏍堢瓑鐩稿叧淇℃伅銆�
-16. 缂撳瓨鐩戞帶锛氬绯荤粺鐨勭紦瀛樹俊鎭煡璇紝鍛戒护缁熻绛夈��
-17. 鍦ㄧ嚎鏋勫缓鍣細鎷栧姩琛ㄥ崟鍏冪礌鐢熸垚鐩稿簲鐨凥TML浠ｇ爜銆�
-18. 杩炴帴姹犵洃瑙嗭細鐩戣褰撳墠绯荤粺鏁版嵁搴撹繛鎺ユ睜鐘舵�侊紝鍙繘琛屽垎鏋怱QL鎵惧嚭绯荤粺鎬ц兘鐡堕銆�
-
-## 鍦ㄧ嚎浣撻獙
-
-- admin/admin123
-- 闄嗛檰缁画鏀跺埌涓�浜涙墦璧忥紝涓轰簡鏇村ソ鐨勪綋楠屽凡鐢ㄤ簬婕旂ず鏈嶅姟鍣ㄥ崌绾с�傝阿璋㈠悇浣嶅皬浼欎即銆�
-
-婕旂ず鍦板潃锛歨ttp://vue.ruoyi.vip
-鏂囨。鍦板潃锛歨ttp://doc.ruoyi.vip
-
-## 婕旂ず鍥�
-
-<table>
- <tr>
- <td><img src="https://oscimg.oschina.net/oscnet/cd1f90be5f2684f4560c9519c0f2a232ee8.jpg"/></td>
- <td><img src="https://oscimg.oschina.net/oscnet/1cbcf0e6f257c7d3a063c0e3f2ff989e4b3.jpg"/></td>
- </tr>
- <tr>
- <td><img src="https://oscimg.oschina.net/oscnet/up-8074972883b5ba0622e13246738ebba237a.png"/></td>
- <td><img src="https://oscimg.oschina.net/oscnet/up-9f88719cdfca9af2e58b352a20e23d43b12.png"/></td>
- </tr>
- <tr>
- <td><img src="https://oscimg.oschina.net/oscnet/up-39bf2584ec3a529b0d5a3b70d15c9b37646.png"/></td>
- <td><img src="https://oscimg.oschina.net/oscnet/up-936ec82d1f4872e1bc980927654b6007307.png"/></td>
- </tr>
- <tr>
- <td><img src="https://oscimg.oschina.net/oscnet/up-b2d62ceb95d2dd9b3fbe157bb70d26001e9.png"/></td>
- <td><img src="https://oscimg.oschina.net/oscnet/up-d67451d308b7a79ad6819723396f7c3d77a.png"/></td>
- </tr>
- <tr>
- <td><img src="https://oscimg.oschina.net/oscnet/5e8c387724954459291aafd5eb52b456f53.jpg"/></td>
- <td><img src="https://oscimg.oschina.net/oscnet/644e78da53c2e92a95dfda4f76e6d117c4b.jpg"/></td>
- </tr>
- <tr>
- <td><img src="https://oscimg.oschina.net/oscnet/up-8370a0d02977eebf6dbf854c8450293c937.png"/></td>
- <td><img src="https://oscimg.oschina.net/oscnet/up-49003ed83f60f633e7153609a53a2b644f7.png"/></td>
- </tr>
- <tr>
- <td><img src="https://oscimg.oschina.net/oscnet/up-d4fe726319ece268d4746602c39cffc0621.png"/></td>
- <td><img src="https://oscimg.oschina.net/oscnet/up-c195234bbcd30be6927f037a6755e6ab69c.png"/></td>
- </tr>
- <tr>
- <td><img src="https://oscimg.oschina.net/oscnet/b6115bc8c31de52951982e509930b20684a.jpg"/></td>
- <td><img src="https://oscimg.oschina.net/oscnet/up-5e4daac0bb59612c5038448acbcef235e3a.png"/></td>
- </tr>
-</table>
-
-
-## 鑻ヤ緷鍓嶅悗绔垎绂讳氦娴佺兢
-
-QQ缇わ細 [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ 鐐瑰嚮鎸夐挳鍏ョ兢銆�
\ No newline at end of file
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java
index 71bfddb..009b268 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java
@@ -121,4 +121,7 @@
@ApiModelProperty("鍏嶆")
private Integer isExemption;
+
+ @ApiModelProperty("鍘熸潗鏂檌d(瀵煎嚭鐢�)")
+ private String ids;
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
index e6fbad1..d824587 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
@@ -94,6 +94,14 @@
* @return
*/
List<SampleDto> getStandardTree3(@Param("sampleType") String sampleType);
+
+ /**
+ * 鏍规嵁鍘熸潗鏂檌d鍒楄〃鏌ヨ鍘熸潗鏂欎俊鎭�
+ * @param ifsIds
+ * @return
+ */
+ List<IfsInventoryQuantitySupplierDto> getIfsByIds(@Param("ifsIds") List<String> ifsIds);
+
}
diff --git a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
index 39c9d07..4060428 100644
--- a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -389,4 +389,13 @@
where sample_type = #{sampleType}
and sample is null
</select>
+
+ <!-- 鏍规嵁鍘熸潗鏂檌d鍒楄〃鏌ヨ鍘熸潗鏂欎俊鎭� -->
+ <select id="getIfsByIds" resultType="com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto">
+ <include refid="getIfsOrder"/>
+ where id in
+ <foreach item="id" collection="ifsIds" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </select>
</mapper>
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceImpowerController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceImpowerController.java
new file mode 100644
index 0000000..092f7c5
--- /dev/null
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceImpowerController.java
@@ -0,0 +1,108 @@
+package com.ruoyi.device.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.device.dto.DeviceImpowerDto;
+import com.ruoyi.device.pojo.DeviceImpower;
+import com.ruoyi.device.service.DeviceImpowerService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * <p>
+ * 璁惧浣跨敤鎺堟潈琛� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author
+ * @since 2025-04-17 03:23:23
+ */
+@Api(tags = "璁惧浣跨敤鎺堟潈琛�")
+@RestController
+@RequestMapping("/deviceImpower")
+public class DeviceImpowerController {
+
+ @Resource
+ private DeviceImpowerService deviceImpowerService;
+
+ /**
+ * 鍒嗛〉鏌ヨ浣跨敤鎺堟潈
+ * @return
+ */
+ @ApiOperation("鍒嗛〉鏌ヨ浣跨敤鎺堟潈")
+ @GetMapping("selectDeviceImpowerByPage")
+ public Result<IPage<DeviceImpower>> selectDeviceImpowerByPage(Page page, DeviceImpowerDto itemParameter){
+ return deviceImpowerService.selectDeviceImpowerByPage(page, itemParameter);
+ }
+
+ /**
+ * 鏂板浣跨敤鎺堟潈
+ * @param deviceImpowerDto 浣跨敤鎺堟潈
+ */
+ @ApiOperation("鏂板浣跨敤鎺堟潈")
+ @PostMapping("/addImpower")
+ public Result addImpower(@RequestBody DeviceImpowerDto deviceImpowerDto) {
+ return deviceImpowerService.addImpower(deviceImpowerDto);
+ }
+
+ /**
+ * 淇敼浣跨敤鎺堟潈
+ * @param deviceImpowerDto 浣跨敤鎺堟潈
+ */
+ @ApiOperation("淇敼浣跨敤鎺堟潈")
+ @PostMapping("/updateImpower")
+ public Result updateImpower(@RequestBody DeviceImpowerDto deviceImpowerDto) {
+ return deviceImpowerService.updateImpower(deviceImpowerDto);
+ }
+
+ /**
+ * 鍒犻櫎浣跨敤鎺堟潈
+ * @param deviceImpowerDto 浣跨敤鎺堟潈
+ */
+ @ApiOperation("鍒犻櫎浣跨敤鎺堟潈")
+ @DeleteMapping("/deleteImpower")
+ public Result deleteImpower(DeviceImpowerDto deviceImpowerDto) {
+ return deviceImpowerService.deleteImpower(deviceImpowerDto);
+ }
+
+ /**
+ * 鏌ヨ浣跨敤鎺堟潈璇︽儏
+ */
+ @ApiOperation("鏌ヨ浣跨敤鎺堟潈璇︽儏")
+ @GetMapping("/getImpowerDetail")
+ public Result<DeviceImpowerDto> getImpowerDetail(Integer impowerId) {
+ return deviceImpowerService.getImpowerDetail(impowerId);
+ }
+
+ /**
+ * 鎻愪氦鎵瑰噯
+ */
+ @ApiOperation("鎻愪氦鎵瑰噯閫氱煡")
+ @PostMapping("/submitReviewImpowerStatus")
+ public Result submitReviewImpowerStatus(@RequestBody DeviceImpowerDto deviceImpowerDto) {
+ return deviceImpowerService.submitReviewImpowerStatus(deviceImpowerDto);
+ }
+
+ /**
+ * 浣跨敤鎺堟潈鎵瑰噯
+ */
+ @ApiOperation("鎺堟潈鎵瑰噯")
+ @PostMapping("/reviewImpowerStatus")
+ public Result reviewImpowerStatus(@RequestBody DeviceImpowerDto deviceImpowerDto) {
+ return deviceImpowerService.reviewImpowerStatus(deviceImpowerDto);
+ }
+
+ /**
+ * 瀵煎嚭浣跨敤鎺堟潈
+ */
+ @ApiOperation("瀵煎嚭浣跨敤鎺堟潈")
+ @GetMapping("/exportDeviceImpower")
+ public Result exportDeviceImpower(@RequestParam("impowerId") Integer impowerId, HttpServletResponse response) {
+ return deviceImpowerService.exportDeviceImpowerDto(impowerId, response);
+ }
+
+}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceInstructionController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceInstructionController.java
index f9d4d7f..207c170 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceInstructionController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceInstructionController.java
@@ -27,7 +27,7 @@
* 浣滀笟鎸囧涔︽坊鍔犲彈鎺ф枃浠惰〃 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-12-04 10:29:18
*/
@RestController
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
index 44cf11a..46fadff 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
@@ -1,27 +1,18 @@
package com.ruoyi.device.controller;
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.write.metadata.style.WriteCellStyle;
-import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.common.numgen.NumberGenerator;
-import com.ruoyi.device.excel.DeviceMaintenanceExport;
+import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.DeviceMaintenanceService;
+import com.ruoyi.system.mapper.UserMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
/**
* todo: 瀛欐渤婊�
@@ -35,51 +26,56 @@
private DeviceMaintenanceService deviceMaintenanceService;
@Autowired
- private NumberGenerator<DeviceMaintenance> numberGenerator;
+ private UserMapper userMapper;
+
/**
- * 鏂板璁惧缁存姢淇濆吇
+ * 璁惧缁存姢鍒嗛〉鏌ヨ
* @param deviceMaintenance
* @return
*/
- @ApiOperation(value = "鏂板璁惧缁存姢淇濆吇")
- @PostMapping("/addDeviceMaintenance")
- public Result addDeviceMaintenance(@RequestBody DeviceMaintenance deviceMaintenance){
- String year = new SimpleDateFormat("yy", Locale.CHINESE).format(new Date());
- String month = new SimpleDateFormat("MM", Locale.CHINESE).format(new Date());
- String processNumber = numberGenerator.generateNumberWithPrefix(3, "DG-TC-23FM " + month + "-" + year + month, DeviceMaintenance::getDeviceNumber);
- deviceMaintenance.setDeviceNumber(processNumber);
- return Result.success(deviceMaintenanceService.save(deviceMaintenance));
+ @ApiOperation(value = "璁惧缁存姢鍒嗛〉鏌ヨ")
+ @GetMapping("/selectDeviceMaintenancePage")
+ public Result selectDeviceMaintenancePage(Page page, DeviceMaintenanceDto deviceMaintenance){
+ return Result.success(deviceMaintenanceService.selectDeviceMaintenancePage(page, deviceMaintenance));
}
+
/**
- * 閫氳繃璁惧id鏌ヨ璁惧缁存姢淇濆吇淇℃伅
- * @param deviceId
- * @param page
- * @param deviceNumber
+ * 鏂板淇敼璁惧缁存姢淇濆吇
+ * @param deviceMaintenance
* @return
*/
- @ApiOperation(value = "閫氳繃璁惧id鏌ヨ璁惧缁存姢淇濆吇淇℃伅")
- @GetMapping("/getDeviceMaintenancePage")
- public Result getDeviceMaintenancePage(@RequestParam("deviceId") Integer deviceId, Page page, String deviceNumber){
- return Result.success(deviceMaintenanceService.getDeviceMaintenancePage(page, deviceId, deviceNumber));
+ @ApiOperation(value = "鏂板淇敼璁惧缁存姢淇濆吇")
+ @PostMapping("/addDeviceMaintenance")
+ public Result addDeviceMaintenance(@RequestBody DeviceMaintenance deviceMaintenance){
+ if (deviceMaintenance.getDeviceId() == null) {
+ throw new RuntimeException("缂哄皯璁惧id");
+ }
+ User user = userMapper.selectById(deviceMaintenance.getMaintenanceUserId());
+ deviceMaintenance.setMaintenanceUserName(user.getName());
+
+ return Result.success(deviceMaintenanceService.saveOrUpdate(deviceMaintenance));
}
/**
- * 鍒犻櫎璁惧缁存姢淇濆吇
+ * 鍒犻櫎淇敼璁惧缁存姢淇濆吇
* @param id
+ * @return
*/
- @ApiOperation(value = "鏂板璁惧缁存姢淇濆吇")
+ @ApiOperation(value = "鍒犻櫎淇敼璁惧缁存姢淇濆吇")
@DeleteMapping("/deleteDeviceMaintenance")
- public void deleteDeviceMaintenance( Integer id) {
- deviceMaintenanceService.removeById(id);
+ public Result deleteDeviceMaintenance(Integer id){
+ return Result.success(deviceMaintenanceService.removeById(id));
}
-
- @ApiOperation(value = "璁惧缁存姢璁板綍瀵煎嚭")
- @GetMapping("/exportMaintenanceRecord")
- public void exportMaintenanceRecord(@RequestParam("deviceId") Integer deviceId, HttpServletResponse response) throws Exception {
- deviceMaintenanceService.exportMaintenanceRecord(deviceId, response);
+ /**
+ * 瀵煎嚭璁惧缁存姢淇濆吇
+ */
+ @ApiOperation("瀵煎嚭璁惧缁存姢淇濆吇")
+ @GetMapping("/exportDeviceMaintenance")
+ public void exportDeviceMaintenance(@RequestParam("deviceId") Integer deviceId, HttpServletResponse response) {
+ deviceMaintenanceService.exportDeviceMaintenance(deviceId, response);
}
}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMetricRecordController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMetricRecordController.java
index 67ce760..392ae85 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMetricRecordController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMetricRecordController.java
@@ -26,7 +26,7 @@
* 璁惧鏍″噯 - 鏍″噯璁板綍 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-09-27 10:20:01
*/
@Api(tags = "璁惧 - 璁惧鏍″噯")
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceStateController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceStateController.java
index 1d2ff28..8bea151 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceStateController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceStateController.java
@@ -28,7 +28,7 @@
* 璁惧鍋滅敤/鍚敤 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-09-26 09:51:40
*/
@RestController
diff --git a/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceImpowerDetailsDto.java b/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceImpowerDetailsDto.java
new file mode 100644
index 0000000..502e986
--- /dev/null
+++ b/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceImpowerDetailsDto.java
@@ -0,0 +1,25 @@
+package com.ruoyi.device.dto;
+
+import com.ruoyi.device.pojo.DeviceImpowerDetails;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author zhuo
+ * @Date 2025/4/17
+ */
+@Data
+public class DeviceImpowerDetailsDto extends DeviceImpowerDetails {
+
+ @ApiModelProperty("搴忓彿")
+ private Integer index;
+
+ @ApiModelProperty("浠櫒璁惧鍚嶇О")
+ private String deviceName;
+
+ @ApiModelProperty("浠櫒璁惧鍨嬪彿")
+ private String specificationModel;
+
+ @ApiModelProperty("浠櫒缂栧彿")
+ private String managementNumber;
+}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceImpowerDto.java b/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceImpowerDto.java
new file mode 100644
index 0000000..67ad3aa
--- /dev/null
+++ b/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceImpowerDto.java
@@ -0,0 +1,24 @@
+package com.ruoyi.device.dto;
+
+import com.ruoyi.device.pojo.DeviceImpower;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author zhuo
+ * @Date 2025/4/17
+ */
+@Data
+public class DeviceImpowerDto extends DeviceImpower {
+
+ @ApiModelProperty("璇︽儏")
+ private List<DeviceImpowerDetailsDto> deviceImpowerDetails;
+
+ @ApiModelProperty("鎺堟潈鏃ユ湡涓枃")
+ private String auditDateCH;
+
+ @ApiModelProperty("鎺堟潈鏃ユ湡鑻辨枃")
+ private String auditDateEN;
+}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java b/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
new file mode 100644
index 0000000..fdf4384
--- /dev/null
+++ b/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
@@ -0,0 +1,20 @@
+package com.ruoyi.device.dto;
+
+import com.ruoyi.device.pojo.DeviceMaintenance;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author zhuo
+ * @Date 2025/4/17
+ */
+@Data
+public class DeviceMaintenanceDto extends DeviceMaintenance {
+
+ @ApiModelProperty("璁惧鍚嶇О")
+ private String deviceName;
+
+ @ApiModelProperty("璁惧缂栧彿")
+ private String managementNumber;
+
+}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceImpowerDetailsMapper.java b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceImpowerDetailsMapper.java
new file mode 100644
index 0000000..200e9a9
--- /dev/null
+++ b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceImpowerDetailsMapper.java
@@ -0,0 +1,26 @@
+package com.ruoyi.device.mapper;
+
+import com.ruoyi.device.dto.DeviceImpowerDetailsDto;
+import com.ruoyi.device.pojo.DeviceImpowerDetails;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 璁惧閲忓�兼函婧愯鍒掕鎯呰〃 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author
+ * @since 2025-04-17 03:23:39
+ */
+public interface DeviceImpowerDetailsMapper extends BaseMapper<DeviceImpowerDetails> {
+
+ /**
+ * 鏌ヨ璁惧浣跨敤璇︽儏
+ * @param impowerId
+ * @return
+ */
+ List<DeviceImpowerDetailsDto> deviceImpowerDetailsList(@Param("impowerId") Integer impowerId);
+}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceImpowerMapper.java b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceImpowerMapper.java
new file mode 100644
index 0000000..8fb2b91
--- /dev/null
+++ b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceImpowerMapper.java
@@ -0,0 +1,36 @@
+package com.ruoyi.device.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.device.dto.DeviceImpowerDto;
+import com.ruoyi.device.dto.DeviceTraceabilityManagementDto;
+import com.ruoyi.device.pojo.DeviceImpower;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 璁惧閲忓�兼函婧愯鍒掕〃 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author
+ * @since 2025-04-17 03:23:23
+ */
+public interface DeviceImpowerMapper extends BaseMapper<DeviceImpower> {
+
+ /**
+ * 鍒嗛〉鏌ヨ浣跨敤鎺堟潈
+ * @param page
+ * @param deviceImpowerDtoQueryWrapper
+ * @return
+ */
+ IPage<DeviceImpower> selectDeviceParameterPage(@Param("page") Page page, @Param("ew") QueryWrapper<DeviceImpowerDto> deviceImpowerDtoQueryWrapper);
+
+ /**
+ * 鏍规嵁id鏌ヨ璁惧浣跨敤鎺堟潈
+ * @param traceabilityManagementId
+ * @return
+ */
+ DeviceTraceabilityManagementDto selectDeviceTraceabilityManagementById(@Param("traceabilityManagementId") Integer traceabilityManagementId);
+}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java
index b4cbdfb..e538a31 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java
@@ -1,12 +1,14 @@
package com.ruoyi.device.mapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.device.excel.DeviceMaintenanceExport;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.pojo.DeviceMaintenance;
import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
+import org.apache.ibatis.annotations.Param;
/**
* 璁惧缁存姢淇濆吇
@@ -14,4 +16,11 @@
@Mapper
public interface DeviceMaintenanceMapper extends BaseMapper<DeviceMaintenance> {
+ /**
+ * 璁惧缁存姢鍒嗛〉鏌ヨ
+ * @param page
+ * @return
+ */
+ IPage<DeviceMaintenanceDto> selectDeviceMaintenancePage(@Param("page") Page page, @Param("ew") QueryWrapper<DeviceMaintenanceDto> ew);
+
}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMetricRecordMapper.java b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMetricRecordMapper.java
index bc4bc28..65f45dd 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMetricRecordMapper.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMetricRecordMapper.java
@@ -8,7 +8,7 @@
* 璁惧鏍″噯 - 鏍″噯璁板綍 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-09-27 10:20:01
*/
public interface DeviceMetricRecordMapper extends BaseMapper<DeviceMetricRecord> {
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMetricsCopyMapper.java b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMetricsCopyMapper.java
index 4c1824a..f5a66ca 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMetricsCopyMapper.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMetricsCopyMapper.java
@@ -8,7 +8,7 @@
* 璁惧鏍″噯 - 鏍″噯璁板綍 - 鏍″噯鏉＄洰 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-09-27 10:20:11
*/
public interface DeviceMetricsCopyMapper extends BaseMapper<DeviceMetricsCopy> {
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceStateMapper.java b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceStateMapper.java
index ea33e6b..5f2bc41 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceStateMapper.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceStateMapper.java
@@ -12,7 +12,7 @@
* 璁惧鍋滅敤/鍚敤 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-09-26 09:51:40
*/
public interface DeviceStateMapper extends BaseMapper<DeviceState> {
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mapper/InstructionMapper.java b/cnas-device/src/main/java/com/ruoyi/device/mapper/InstructionMapper.java
index 022c5e4..ad93c15 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/mapper/InstructionMapper.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/mapper/InstructionMapper.java
@@ -15,7 +15,7 @@
* 浣滀笟鎸囧涔︽坊鍔犲彈鎺ф枃浠惰〃 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-12-04 10:29:18
*/
public interface InstructionMapper extends BaseMapper<DeviceInstruction> {
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mapper/OperationInstructionMapper.java b/cnas-device/src/main/java/com/ruoyi/device/mapper/OperationInstructionMapper.java
index f034e12..6c6576d 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/mapper/OperationInstructionMapper.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/mapper/OperationInstructionMapper.java
@@ -11,7 +11,7 @@
* 璁惧 - 浣滀笟鎸囧涔� 娣诲姞鍙楁帶鏂囦欢 瀛� Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-12-04 10:43:32
*/
public interface OperationInstructionMapper extends BaseMapper<OperationInstruction> {
diff --git a/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceImpower.java b/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceImpower.java
new file mode 100644
index 0000000..5851883
--- /dev/null
+++ b/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceImpower.java
@@ -0,0 +1,75 @@
+package com.ruoyi.device.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 璁惧浣跨敤鎺堟潈琛�
+ * </p>
+ *
+ * @author
+ * @since 2025-04-17 03:23:23
+ */
+@Getter
+@Setter
+@TableName("device_impower")
+@ApiModel(value = "DeviceImpower瀵硅薄", description = "璁惧浣跨敤鎺堟潈琛�")
+public class DeviceImpower implements Serializable {
+
+ @ApiModelProperty("鎺堟潈id")
+ @TableId(value = "impower_id", type = IdType.AUTO)
+ private Integer impowerId;
+
+ @ApiModelProperty("璁″垝骞翠唤")
+ private String impowerYear;
+
+ @ApiModelProperty("缂栧埗浜篿d")
+ private Integer compilerId;
+
+ @ApiModelProperty("缂栧埗浜�")
+ private String compiler;
+
+ @ApiModelProperty("缂栧埗鏃堕棿")
+ private LocalDateTime datePreparation;
+
+ @ApiModelProperty("瀹℃牳鐘舵�侊紝0鏈鏍革紝1瀹℃牳")
+ private Integer status;
+
+ @ApiModelProperty("鎺堟潈id")
+ private Integer auditId;
+
+ @ApiModelProperty("鎺堟潈浜�")
+ private String audit;
+
+ @ApiModelProperty("鎺堟潈鏃ユ湡")
+ private LocalDateTime auditDate;
+
+ @ApiModelProperty("鎺堟潈淇℃伅")
+ private String auditRemark;
+
+ @ApiModelProperty("鍒涘缓浜篿d")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @ApiModelProperty("鍒涘缓鏃ユ湡")
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("淇敼浜篿d")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceImpowerDetails.java b/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceImpowerDetails.java
new file mode 100644
index 0000000..239db65
--- /dev/null
+++ b/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceImpowerDetails.java
@@ -0,0 +1,61 @@
+package com.ruoyi.device.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 璁惧閲忓�兼函婧愯鍒掕鎯呰〃
+ * </p>
+ *
+ * @author
+ * @since 2025-04-17 03:23:39
+ */
+@Getter
+@Setter
+@TableName("device_impower_details")
+@ApiModel(value = "DeviceImpowerDetails瀵硅薄", description = "璁惧閲忓�兼函婧愯鍒掕鎯呰〃")
+public class DeviceImpowerDetails implements Serializable {
+
+
+ @ApiModelProperty("璁惧閲忓�兼函婧愯鍒掕鎯卛d")
+ @TableId(value = "impower_detail_id", type = IdType.AUTO)
+ private Integer impowerDetailId;
+
+ @ApiModelProperty("璁惧閲忓�兼函婧愯鍒抜d")
+ private Integer impowerId;
+
+ @ApiModelProperty("璁惧id")
+ private Integer deviceId;
+
+ @ApiModelProperty("妫�娴嬮」鐩�")
+ private String inspectionItem;
+
+ @ApiModelProperty("琚巿鏉冧汉")
+ private String delegatedUser;
+
+ @ApiModelProperty("鍒涘缓浜篿d")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @ApiModelProperty("鍒涘缓鏃ユ湡")
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("淇敼浜篿d")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceInstruction.java b/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceInstruction.java
index 5a4f845..b4752c8 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceInstruction.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceInstruction.java
@@ -14,7 +14,7 @@
* 浣滀笟鎸囧涔︽坊鍔犲彈鎺ф枃浠惰〃
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-12-04 10:29:18
*/
@Getter
diff --git a/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java b/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
index bf3c6c6..598a08c 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
@@ -1,44 +1,65 @@
package com.ruoyi.device.pojo;
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.deepoove.poi.data.PictureRenderData;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
- * 璁惧缁存姢淇濆吇
+ * 璁惧缁存姢娣诲姞缁存姢璁板綍琛�
+ *
+ * @author makejava
+ * @since 2025-04-17 11:28:56
*/
@Data
-@EqualsAndHashCode(callSuper = false)
@TableName("device_maintenance")
public class DeviceMaintenance {
- //璁惧id
@TableId(type = IdType.AUTO)
private Integer id;
+ @ApiModelProperty("璁惧id")
private Integer deviceId;
- private String deviceName;
- //缂栧彿
- private String deviceNumber;
- //缁熶竴缂栧彿
- private String managementNumber;
- //缁存姢鍐呭
- private String content;
- //缁存姢鏃ユ湡
+ @ApiModelProperty("缁存姢鏃ユ湡")
+ private LocalDate maintenanceDate;
+
+ @ApiModelProperty("缁存姢鍐呭")
+ private String maintenanceContent;
+
+ @ApiModelProperty("缁存姢浜篿d")
+ private Integer maintenanceUserId;
+
+ @ApiModelProperty("缁存姢浜�")
+ private String maintenanceUserName;
+
+ @ApiModelProperty("澶囨敞")
+ private String remark;
+
+ @ApiModelProperty("鍒涘缓鏃ユ湡")
@TableField(fill = FieldFill.INSERT)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private LocalDate date;
- //涓嬫缁存姢鏃ユ湡
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private LocalDate nextDate;
- //缁存姢绫诲瀷
- private Integer maintenanceType;
- //缁存姢浜哄憳
- private String name;
- //澶囨敞
- private String comments;
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("鍒涘缓浜篿d")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @ApiModelProperty("鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty("鏇存柊浜篿d")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ @TableField(select = false, exist = false)
+ @ApiModelProperty("缁存姢浜哄浘鐗�")
+ private PictureRenderData maintenanceUserUrlRender;
+
+
}
+
diff --git a/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceMetricRecord.java b/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceMetricRecord.java
index 5855ca2..6e19934 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceMetricRecord.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceMetricRecord.java
@@ -16,7 +16,7 @@
* 璁惧鏍″噯 - 鏍″噯璁板綍
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-09-27 10:20:01
*/
@Getter
diff --git a/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceMetricsCopy.java b/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceMetricsCopy.java
index fb7d79b..1091033 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceMetricsCopy.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceMetricsCopy.java
@@ -16,7 +16,7 @@
* 璁惧鏍″噯 - 鏍″噯璁板綍 - 鏍″噯鏉＄洰
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-09-27 10:20:11
*/
@Getter
diff --git a/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceState.java b/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceState.java
index e212f3e..b27a092 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceState.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceState.java
@@ -15,7 +15,7 @@
* 璁惧鍋滅敤/鍚敤
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-09-26 09:51:40
*/
@Getter
diff --git a/cnas-device/src/main/java/com/ruoyi/device/pojo/OperationInstruction.java b/cnas-device/src/main/java/com/ruoyi/device/pojo/OperationInstruction.java
index 7666be1..0dce8b3 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/pojo/OperationInstruction.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/pojo/OperationInstruction.java
@@ -14,7 +14,7 @@
* 璁惧 - 浣滀笟鎸囧涔� 娣诲姞鍙楁帶鏂囦欢 瀛�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-12-04 10:43:32
*/
@Getter
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceImpowerDetailsService.java b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceImpowerDetailsService.java
new file mode 100644
index 0000000..a19e5df
--- /dev/null
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceImpowerDetailsService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.device.service;
+
+import com.ruoyi.device.pojo.DeviceImpowerDetails;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 璁惧閲忓�兼函婧愯鍒掕鎯呰〃 鏈嶅姟绫�
+ * </p>
+ *
+ * @author
+ * @since 2025-04-17 03:23:39
+ */
+public interface DeviceImpowerDetailsService extends IService<DeviceImpowerDetails> {
+
+}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceImpowerService.java b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceImpowerService.java
new file mode 100644
index 0000000..d18475a
--- /dev/null
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceImpowerService.java
@@ -0,0 +1,71 @@
+package com.ruoyi.device.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.device.dto.DeviceImpowerDto;
+import com.ruoyi.device.pojo.DeviceImpower;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.device.pojo.DeviceImpower;
+import org.apache.ibatis.annotations.Param;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * <p>
+ * 璁惧浣跨敤鎺堟潈琛� 鏈嶅姟绫�
+ * </p>
+ *
+ * @author
+ * @since 2025-04-17 03:23:23
+ */
+public interface DeviceImpowerService extends IService<DeviceImpower> {
+
+ /**
+ * 鍒嗛〉鏌ヨ浣跨敤鎺堟潈
+ * @param page 鍒嗛〉鍙傛暟
+ * @param itemParameter 浣跨敤鎺堟潈
+ * @return
+ */
+ Result<IPage<DeviceImpower>> selectDeviceImpowerByPage(@Param("page") Page page, @Param("itemParameter") DeviceImpowerDto itemParameter);
+
+ /**
+ * 鏂板浣跨敤鎺堟潈
+ * @param deviceImpowerDto 浣跨敤鎺堟潈
+ */
+ Result addImpower(DeviceImpowerDto deviceImpowerDto);
+
+ /**
+ * 淇敼浣跨敤鎺堟潈
+ * @param deviceImpowerDto 浣跨敤鎺堟潈
+ */
+ Result updateImpower(DeviceImpowerDto deviceImpowerDto);
+
+ /**
+ * 鍒犻櫎浣跨敤鎺堟潈
+ * @param deviceImpowerDto 浣跨敤鎺堟潈
+ */
+ Result deleteImpower(DeviceImpowerDto deviceImpowerDto);
+
+ /**
+ * 鏌ヨ浣跨敤鎺堟潈璇︽儏
+ */
+ Result<DeviceImpowerDto> getImpowerDetail(Integer impowerId);
+
+ /**
+ * 鎻愪氦鎵瑰噯
+ * @param deviceImpowerDto
+ * @return
+ */
+ Result submitReviewImpowerStatus(DeviceImpowerDto deviceImpowerDto);
+
+ /**
+ * 浣跨敤鎺堟潈瀹℃牳
+ */
+ Result reviewImpowerStatus(DeviceImpowerDto deviceImpowerDto);
+
+ /**
+ * 浣跨敤鎺堟潈瀵煎嚭
+ */
+ Result exportDeviceImpowerDto(Integer impowerId, HttpServletResponse response);
+}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceInstructionService.java b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceInstructionService.java
index 8d1c73a..7932e3c 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceInstructionService.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceInstructionService.java
@@ -14,7 +14,7 @@
* 浣滀笟鎸囧涔︽坊鍔犲彈鎺ф枃浠惰〃 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-12-04 10:29:18
*/
public interface DeviceInstructionService extends IService<DeviceInstruction> {
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceMaintenanceService.java b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceMaintenanceService.java
index 6ba0be6..8830d9f 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceMaintenanceService.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceMaintenanceService.java
@@ -3,21 +3,28 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.device.excel.DeviceMaintenanceExport;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.pojo.DeviceMaintenance;
import javax.servlet.http.HttpServletResponse;
-import java.util.List;
+/**
+ * 璁惧缁存姢淇濆吇
+ */
public interface DeviceMaintenanceService extends IService<DeviceMaintenance> {
- IPage<DeviceMaintenance> getDeviceMaintenancePage(Page page, Integer deviceId, String deviceNumber);
-
/**
- * 瀵煎嚭Word璁惧缁存姢璁板綍
- *
+ * 璁惧缁存姢鍒嗛〉鏌ヨ
+ * @return
+ */
+ IPage<DeviceMaintenanceDto> selectDeviceMaintenancePage(Page page, DeviceMaintenanceDto deviceMaintenance);
+
+ /**
+ * 瀵煎嚭璁惧缁存姢淇濆吇
* @param deviceId
* @param response
+ * @return
*/
- void exportMaintenanceRecord(Integer deviceId, HttpServletResponse response);
+ void exportDeviceMaintenance(Integer deviceId, HttpServletResponse response);
}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceMetricRecordService.java b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceMetricRecordService.java
index d55a281..0cd8675 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceMetricRecordService.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceMetricRecordService.java
@@ -8,7 +8,7 @@
* 璁惧鏍″噯 - 鏍″噯璁板綍 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-09-27 10:20:01
*/
public interface DeviceMetricRecordService extends IService<DeviceMetricRecord> {
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceMetricsCopyService.java b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceMetricsCopyService.java
index be7c8cc..1839fe1 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceMetricsCopyService.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceMetricsCopyService.java
@@ -8,7 +8,7 @@
* 璁惧鏍″噯 - 鏍″噯璁板綍 - 鏍″噯鏉＄洰 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-09-27 10:20:11
*/
public interface DeviceMetricsCopyService extends IService<DeviceMetricsCopy> {
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceOperationInstructionService.java b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceOperationInstructionService.java
index afc8bdd..5447a98 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceOperationInstructionService.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceOperationInstructionService.java
@@ -11,7 +11,7 @@
* 璁惧 - 浣滀笟鎸囧涔� 娣诲姞鍙楁帶鏂囦欢 瀛� 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-12-04 10:43:32
*/
public interface DeviceOperationInstructionService extends IService<OperationInstruction> {
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceStateService.java b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceStateService.java
index 9a2b789..a882a0b 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceStateService.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceStateService.java
@@ -13,7 +13,7 @@
* 璁惧鍋滅敤/鍚敤 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-09-26 09:51:40
*/
public interface DeviceStateService extends IService<DeviceState> {
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceImpowerDetailsServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceImpowerDetailsServiceImpl.java
new file mode 100644
index 0000000..6ce1670
--- /dev/null
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceImpowerDetailsServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.device.service.impl;
+
+import com.ruoyi.device.pojo.DeviceImpowerDetails;
+import com.ruoyi.device.mapper.DeviceImpowerDetailsMapper;
+import com.ruoyi.device.service.DeviceImpowerDetailsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 璁惧閲忓�兼函婧愯鍒掕鎯呰〃 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author
+ * @since 2025-04-17 03:23:39
+ */
+@Service
+public class DeviceImpowerDetailsServiceImpl extends ServiceImpl<DeviceImpowerDetailsMapper, DeviceImpowerDetails> implements DeviceImpowerDetailsService {
+
+}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceImpowerServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceImpowerServiceImpl.java
new file mode 100644
index 0000000..b42a809
--- /dev/null
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceImpowerServiceImpl.java
@@ -0,0 +1,299 @@
+package com.ruoyi.device.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.deepoove.poi.XWPFTemplate;
+import com.deepoove.poi.config.Configure;
+import com.ruoyi.common.constant.MenuJumpPathConstants;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.entity.InformationNotification;
+import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.common.utils.QueryWrappers;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.WxCpUtils;
+import com.ruoyi.device.dto.DeviceImpowerDetailsDto;
+import com.ruoyi.device.dto.DeviceImpowerDto;
+import com.ruoyi.device.mapper.DeviceImpowerDetailsMapper;
+import com.ruoyi.device.pojo.DeviceImpower;
+import com.ruoyi.device.mapper.DeviceImpowerMapper;
+import com.ruoyi.device.pojo.DeviceImpower;
+import com.ruoyi.device.pojo.DeviceImpowerDetails;
+import com.ruoyi.device.service.DeviceImpowerService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.device.service.DeviceImpowerDetailsService;
+import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.inspect.util.UserUtils;
+import com.ruoyi.system.mapper.UserMapper;
+import com.ruoyi.system.service.InformationNotificationService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 璁惧浣跨敤琛� 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author
+ * @since 2025-04-17 03:23:23
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class DeviceImpowerServiceImpl extends ServiceImpl<DeviceImpowerMapper, DeviceImpower> implements DeviceImpowerService {
+
+
+ @Resource
+ private DeviceImpowerDetailsService deviceImpowerDetailsService;
+
+ @Resource
+ private DeviceImpowerDetailsMapper deviceImpowerDetailsMapper;
+ @Resource
+ private ThreadPoolTaskExecutor threadPoolTaskExecutor;
+ @Resource
+ private InformationNotificationService informationNotificationService;
+
+ @Resource
+ private UserMapper userMapper;
+
+ /**
+ * 鍒嗛〉鏌ヨ璁惧浣跨敤
+ *
+ * @param page
+ * @return
+ */
+ @Override
+ public Result<IPage<DeviceImpower>> selectDeviceImpowerByPage(Page page, DeviceImpowerDto deviceImpowerDto) {
+ IPage<DeviceImpower> iPage = baseMapper.selectDeviceParameterPage(page, QueryWrappers.queryWrappers(deviceImpowerDto));
+ return Result.success(iPage);
+ }
+
+
+ /**
+ * 鏂板璁惧浣跨敤
+ *
+ * @param deviceImpowerDto 璁惧浣跨敤
+ */
+ @Override
+ public Result addImpower(DeviceImpowerDto deviceImpowerDto) {
+ Integer userId = SecurityUtils.getUserId().intValue();
+ User user = userMapper.selectById(userId);
+ deviceImpowerDto.setCompilerId(userId);
+ deviceImpowerDto.setCompiler(user.getName());
+ deviceImpowerDto.setDatePreparation(LocalDateTime.now());
+
+ // 鏌ヨ瀹℃牳浜篿d
+ if (deviceImpowerDto.getAuditId() != null) {
+ User auditUser = userMapper.selectById(deviceImpowerDto.getAuditId());
+ deviceImpowerDto.setAudit(auditUser.getName());
+ }
+ this.saveOrUpdate(deviceImpowerDto);
+
+ // 璇︽儏璧嬪�煎苟淇濆瓨
+ List<DeviceImpowerDetailsDto> deviceImpowerDetails = deviceImpowerDto.getDeviceImpowerDetails();
+ if (CollectionUtils.isNotEmpty(deviceImpowerDetails)) { // 璇︽儏涓嶄负绌�
+ List<DeviceImpowerDetails> collect = deviceImpowerDetails.stream().map(detailsDto -> {
+ detailsDto.setImpowerId(deviceImpowerDto.getImpowerId()); // 浣跨敤ID
+ DeviceImpowerDetails details = new DeviceImpowerDetails();
+ BeanUtils.copyProperties(detailsDto, details);
+ return details;
+ }).collect(Collectors.toList());
+ deviceImpowerDetailsService.saveBatch(collect);
+ }
+
+ return Result.success();
+ }
+
+ /**
+ * 淇敼璁惧浣跨敤
+ *
+ * @param deviceImpowerDto 璁惧浣跨敤
+ */
+ @Override
+ public Result updateImpower(DeviceImpowerDto deviceImpowerDto) {
+ // 鏌ヨ瀹℃牳浜篿d
+ if (deviceImpowerDto.getAuditId() != null) {
+ User auditUser = userMapper.selectById(deviceImpowerDto.getAuditId());
+ deviceImpowerDto.setAudit(auditUser.getName());
+ }
+ this.saveOrUpdate(deviceImpowerDto);
+
+ // 鍒犻櫎鍘熸湰鐨勮鎯�
+ deviceImpowerDetailsService.remove(Wrappers.<DeviceImpowerDetails>lambdaQuery().eq(DeviceImpowerDetails::getImpowerId, deviceImpowerDto.getImpowerId()));
+ // 璇︽儏璧嬪�煎苟淇濆瓨
+ List<DeviceImpowerDetailsDto> deviceImpowerDetails = deviceImpowerDto.getDeviceImpowerDetails();
+ if (CollectionUtils.isNotEmpty(deviceImpowerDetails)) { // 璇︽儏涓嶄负绌�
+ List<DeviceImpowerDetails> collect = deviceImpowerDetails.stream().map(detailsDto -> {
+ detailsDto.setImpowerId(deviceImpowerDto.getImpowerId()); // 浣跨敤ID
+ DeviceImpowerDetails details = new DeviceImpowerDetails();
+ BeanUtils.copyProperties(detailsDto, details);
+ return details;
+ }).collect(Collectors.toList());
+ deviceImpowerDetailsService.saveBatch(collect);
+ }
+ return Result.success();
+ }
+
+ /**
+ * 鍒犻櫎璁惧浣跨敤
+ *
+ * @param deviceImpowerDto 璁惧浣跨敤
+ */
+ @Override
+ public Result deleteImpower(DeviceImpowerDto deviceImpowerDto) {
+ this.removeById(deviceImpowerDto);
+ deviceImpowerDetailsService.remove(Wrappers.<DeviceImpowerDetails>lambdaQuery().eq(DeviceImpowerDetails::getImpowerId, deviceImpowerDto.getImpowerId()));
+ return Result.success();
+ }
+
+ /**
+ * 鏌ヨ璁惧浣跨敤璇︽儏
+ *
+ * @param impowerId 璁惧浣跨敤id
+ */
+ @Override
+ public Result<DeviceImpowerDto> getImpowerDetail(Integer impowerId) {
+ // 鏌ヨ璁惧浣跨敤
+ DeviceImpower deviceImpower = baseMapper.selectById(impowerId);
+ // 鏌ヨ璇︽儏
+ DeviceImpowerDto deviceImpowerDto = new DeviceImpowerDto();
+ BeanUtils.copyProperties(deviceImpower, deviceImpowerDto);
+ deviceImpowerDto.setDeviceImpowerDetails(deviceImpowerDetailsMapper.deviceImpowerDetailsList(impowerId));
+ return Result.success(deviceImpowerDto);
+ }
+
+ /**
+ * 鎻愪氦鎵瑰噯
+ * @param deviceImpowerDto
+ * @return
+ */
+ @Override
+ public Result submitReviewImpowerStatus(DeviceImpowerDto deviceImpowerDto) {
+ User audit = userMapper.selectById(deviceImpowerDto.getAuditId());
+ this.update(Wrappers.<DeviceImpower>lambdaUpdate()
+ .eq(DeviceImpower::getImpowerId, deviceImpowerDto.getImpowerId())
+ .set(DeviceImpower::getAuditId, audit.getId())
+ .set(DeviceImpower::getAudit, audit.getName())
+ .set(DeviceImpower::getAuditDate, null)
+ .set(DeviceImpower::getStatus, null)
+ .set(DeviceImpower::getAuditRemark, null));
+
+ DeviceImpower deviceImpower = baseMapper.selectById(deviceImpowerDto.getImpowerId());
+
+// // 鍙戦�佹秷鎭�
+// Integer userId = SecurityUtils.getUserId().intValue();
+// User user = userMapper.selectById(userId);
+// // 娑堟伅鍙戦��
+// InformationNotification info = new InformationNotification();
+// // 鍙戦�佷汉
+// info.setCreateUser(user.getName());
+// info.setMessageType("6");
+// info.setTheme("CNAS璁惧浣跨敤鎵瑰噯閫氱煡");
+// info.setContent(deviceImpower.getPlanYear() + "骞寸殑璁惧浣跨敤寰呮壒鍑�");
+// info.setSenderId(userId);
+// // 鎺ユ敹浜�
+// info.setConsigneeId(audit.getId());
+// info.setJumpPath(MenuJumpPathConstants.DEVICE);
+// informationNotificationService.addInformationNotification(info);
+//
+// // 鍙戦�佷紒涓氬井淇￠�氱煡
+// threadPoolTaskExecutor.execute(() -> {
+// String message = "";
+// message += "CNAS璁惧浣跨敤鏍搁�氱煡";
+// message += "\n璇峰幓璧勬簮绠＄悊-璁惧涓�灞傜洰褰�-璁惧浣跨敤濉啓";
+// message += "\n" + deviceImpower.getPlanYear() + "骞寸殑璁惧浣跨敤寰呮壒鍑�";
+// //鍙戦�佷紒涓氬井淇℃秷鎭�氱煡
+// try {
+// WxCpUtils.inform(audit.getAccount(), message, null);
+// } catch (Exception e) {
+// throw new RuntimeException(e);
+// }
+// });
+ return Result.success();
+ }
+
+ /**
+ *
+ *
+ * @param deviceImpowerDto
+ */
+ @Override
+ public Result reviewImpowerStatus(DeviceImpowerDto deviceImpowerDto) {
+ LambdaUpdateWrapper<DeviceImpower> wrapper = Wrappers.<DeviceImpower>lambdaUpdate()
+ .eq(DeviceImpower::getImpowerId, deviceImpowerDto.getImpowerId())
+ .set(DeviceImpower::getAuditDate, LocalDateTime.now())
+ .set(DeviceImpower::getStatus, deviceImpowerDto.getStatus()) // 瀹℃牳鐘舵��
+ .set(DeviceImpower::getAuditRemark, deviceImpowerDto.getAuditRemark());// 瀹℃牳澶囨敞
+
+ this.update(wrapper); // 鏇存柊
+ return Result.success();
+ }
+
+ /**
+ * 瀵煎嚭璁惧浣跨敤
+ *
+ * @param impowerId 璁惧浣跨敤id
+ */
+ @Override
+ public Result exportDeviceImpowerDto(Integer impowerId, HttpServletResponse response) {
+ // 鏌ヨ璁惧浣跨敤鎺堟潈璁″垝
+ DeviceImpower deviceImpower = baseMapper.selectById(impowerId);
+ DeviceImpowerDto deviceImpowerDto = new DeviceImpowerDto();
+ BeanUtils.copyProperties(deviceImpower, deviceImpowerDto);
+ // 鏍煎紡鍖栨棩鏈熶腑鑻辨枃
+ DateTimeFormatter formatterCH = DateTimeFormatter.ofPattern("yyyy 骞� MM 鏈� dd 鏃�");
+ DateTimeFormatter formatterEN = DateTimeFormatter.ofPattern("yyyy 'Year' MM 'Month' dd 'Day'");
+ deviceImpowerDto.setAuditDateCH(deviceImpower.getAuditDate() == null ? null : deviceImpower.getAuditDate().format(formatterCH));
+ deviceImpowerDto.setAuditDateEN(deviceImpower.getAuditDate() == null ? null : deviceImpower.getAuditDate().format(formatterEN));
+
+ // 鏌ヨ璁惧淇濆吇璁″垝璇︽儏
+ List<DeviceImpowerDetailsDto> deviceImpowerDetailsDtoList = deviceImpowerDetailsMapper.deviceImpowerDetailsList(impowerId);
+ // 璁剧疆搴忓彿
+ deviceImpowerDetailsDtoList.forEach(deviceImpowerDetails -> {
+ deviceImpowerDetails.setIndex(deviceImpowerDetailsDtoList.indexOf(deviceImpowerDetails) + 1);
+ });
+
+ // 鑾峰彇璺緞
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/word/device-impower.docx");
+ Configure configure = Configure.builder()
+ .bind("deviceImpowerDetailsDtoList", new HackLoopTableRenderPolicy())
+ .build();
+ XWPFTemplate template = XWPFTemplate.compile(inputStream, configure).render(
+ new HashMap<String, Object>() {{
+ put("deviceImpower", deviceImpowerDto);
+ put("deviceImpowerDetailsDtoList", deviceImpowerDetailsDtoList);
+ // 鎺堟潈浜哄湴鍧�
+ put("auditUrl", UserUtils.getFinalUserSignatureUrl(deviceImpower.getAuditId()));
+ }});
+
+ try {
+ response.setContentType("application/msword");
+ String fileName = URLEncoder.encode(
+ "璁惧浣跨敤鎺堟潈", "UTF-8");
+ response.setHeader("Content-disposition",
+ "attachment;filename=" + fileName + ".docx");
+ OutputStream os = response.getOutputStream();
+ template.write(os);
+ os.flush();
+ os.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException("瀵煎嚭澶辫触");
+ }
+ return Result.success();
+ }
+}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceInstructionServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceInstructionServiceImpl.java
index a43a987..559be66 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceInstructionServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceInstructionServiceImpl.java
@@ -28,7 +28,7 @@
* 浣滀笟鎸囧涔︽坊鍔犲彈鎺ф枃浠惰〃 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-12-04 10:29:18
*/
@Service
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceImpl.java
index 7c28152..47ec658 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceImpl.java
@@ -1,18 +1,34 @@
package com.ruoyi.device.service.impl;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
-import com.ruoyi.device.excel.DeviceMaintenanceExport;
+import com.deepoove.poi.data.Pictures;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.utils.QueryWrappers;
+import com.ruoyi.device.dto.DeviceImpowerDetailsDto;
+import com.ruoyi.device.dto.DeviceImpowerDto;
+import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.mapper.DeviceMaintenanceMapper;
import com.ruoyi.device.mapper.DeviceMapper;
+import com.ruoyi.device.pojo.Device;
+import com.ruoyi.device.pojo.DeviceImpower;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.DeviceMaintenanceService;
+import com.ruoyi.device.service.DeviceService;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
-import org.apache.commons.lang3.ObjectUtils;
+import com.ruoyi.inspect.util.UserUtils;
+import com.ruoyi.system.service.ISysDictDataService;
+import com.ruoyi.system.service.ISysDictTypeService;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -20,57 +36,99 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URLEncoder;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+/**
+ * 璁惧缁存姢淇濆吇
+ */
@Service
public class DeviceMaintenanceImpl extends ServiceImpl<DeviceMaintenanceMapper, DeviceMaintenance> implements DeviceMaintenanceService {
+ @Resource
+ private DeviceService deviceService;
+ @Resource
+ private ISysDictTypeService iSysDictTypeService;
+ @Value("${file.path}")
+ private String imgUrl;
+
+ /**
+ * 璁惧缁存姢鍒嗛〉鏌ヨ
+ * @return
+ */
@Override
- public IPage<DeviceMaintenance> getDeviceMaintenancePage(Page page, Integer deviceId, String deviceNumber) {
- if (ObjectUtils.isEmpty(deviceNumber)){
- return baseMapper.selectPage(page, Wrappers.<DeviceMaintenance>lambdaQuery()
- .eq(DeviceMaintenance::getDeviceId, deviceId));
+ public IPage<DeviceMaintenanceDto> selectDeviceMaintenancePage(Page page, DeviceMaintenanceDto deviceMaintenance) {
+ if (deviceMaintenance.getDeviceId() == null) {
+ return new Page();
}
- else return baseMapper.selectPage(page, Wrappers.<DeviceMaintenance>lambdaQuery()
- .eq(DeviceMaintenance::getDeviceId, deviceId)
- .like(DeviceMaintenance::getDeviceNumber, deviceNumber));
+ return baseMapper.selectDeviceMaintenancePage(page, QueryWrappers.queryWrappers(deviceMaintenance));
}
+ /**
+ * 瀵煎嚭璁惧缁存姢淇濆吇
+ * @param deviceId
+ * @param response
+ */
@Override
- public void exportMaintenanceRecord(Integer deviceId, HttpServletResponse response) {
- // 鏌ヨcnas璁惧缁翠慨璁板綍
+ public void exportDeviceMaintenance(Integer deviceId, HttpServletResponse response) {
+ // 鏌ヨ璁惧缁存姢淇濆吇
List<DeviceMaintenance> deviceMaintenanceList = baseMapper.selectList(Wrappers.<DeviceMaintenance>lambdaQuery()
- .eq(DeviceMaintenance::getDeviceId, deviceId)
- .select(DeviceMaintenance::getDate,
- DeviceMaintenance::getDeviceNumber,
- DeviceMaintenance::getDeviceName,
- DeviceMaintenance::getManagementNumber,
- DeviceMaintenance::getContent,
- DeviceMaintenance::getName,
- DeviceMaintenance::getComments));
+ .eq(DeviceMaintenance::getDeviceId, deviceId));
+
+ // 鑾峰彇鍒扮涓�涓澶囦娇鐢ㄦ巿鏉�
+ DeviceMaintenanceDto deviceMaintenanceDto = new DeviceMaintenanceDto();
+
+ List<SysDictData> sysDictDataList = null;
+ if (CollectionUtils.isNotEmpty(deviceMaintenanceList)) {
+ BeanUtils.copyProperties(deviceMaintenanceList.get(0), deviceMaintenanceDto);
+ // 鏌ヨ璁惧淇℃伅
+ Device device = deviceService.getById(deviceId);
+ deviceMaintenanceDto.setDeviceName(device.getDeviceName());
+ deviceMaintenanceDto.setManagementNumber(device.getManagementNumber());
+
+ //鏌ヨ缁存姢淇濆吇瀵煎嚭瀛楀吀鍊�
+ sysDictDataList = getDeviceMaintenanceDict(device);
+ }
+
+ // 娣诲姞瀛楀吀鏋氫妇鍊�
+ for (DeviceMaintenance deviceMaintenance : deviceMaintenanceList) {
+ StringBuilder maintenanceContent = new StringBuilder(deviceMaintenance.getMaintenanceContent());
+ if (CollectionUtils.isNotEmpty(sysDictDataList) && StringUtils.isNotBlank(deviceMaintenance.getMaintenanceContent())) {
+ maintenanceContent = new StringBuilder();
+ List<String> splitList = StrUtil.split(deviceMaintenance.getMaintenanceContent(), ',');
+ // 寰幆鍒ゆ柇鏄惁鏈変竴鏍穔ey
+ for (SysDictData sysDictData : sysDictDataList) {
+ if (splitList.contains(sysDictData.getDictLabel())) {
+ maintenanceContent.append("鈽�").append(sysDictData.getDictLabel()).append(" ");
+ } else {
+ maintenanceContent.append("鈻�").append(sysDictData.getDictLabel()).append(" ");
+ }
+ }
+ }
+ deviceMaintenance.setMaintenanceContent(maintenanceContent.toString());
+ // 娣诲姞缁存姢浜哄浘鐗�
+ deviceMaintenance.setMaintenanceUserUrlRender(UserUtils.getFinalUserSignatureUrl(deviceMaintenance.getMaintenanceUserId()));
+
+ }
// 鑾峰彇璺緞
- InputStream inputStream = this.getClass().getResourceAsStream("/static/word/maintenance-records.docx");
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/word/device-maintenance.docx");
Configure configure = Configure.builder()
- .bind("deviceMaintenanceList", new HackLoopTableRenderPolicy())
+ .bind("deviceMaintenances", new HackLoopTableRenderPolicy())
.build();
- // 鑾峰彇璁惧 鍚嶇О 鍜� 缂栧彿
- DeviceMaintenance deviceMaintenance = deviceMaintenanceList.get(0);
- String deviceName = deviceMaintenance.getDeviceName();
- String managementNumber = deviceMaintenance.getManagementNumber();
XWPFTemplate template = XWPFTemplate.compile(inputStream, configure).render(
new HashMap<String, Object>() {{
- put("deviceMaintenanceList", deviceMaintenanceList);
- put("deviceName", deviceName);
- put("managementNumber", managementNumber);
+ put("device", deviceMaintenanceDto);
+ put("deviceMaintenances", deviceMaintenanceList);
}});
try {
response.setContentType("application/msword");
String fileName = URLEncoder.encode(
- "璁惧缁存姢淇濆吇璁板綍", "UTF-8");
+ "璁惧淇濆吇缁存姢", "UTF-8");
response.setHeader("Content-disposition",
"attachment;filename=" + fileName + ".docx");
OutputStream os = response.getOutputStream();
@@ -81,6 +139,58 @@
e.printStackTrace();
throw new RuntimeException("瀵煎嚭澶辫触");
}
+
}
+ /**
+ * ****鏌ヨ缁存姢淇濆吇瀵煎嚭瀛楀吀鍊�***
+ * @param device
+ */
+ private List<SysDictData> getDeviceMaintenanceDict(Device device) {
+ List<SysDictData> sysDictDataList = new ArrayList<>();
+ // 鏌ヨ缁存姢淇濆吇瀵煎嚭瀛楀吀鍊�
+ if (StringUtils.isNotBlank(device.getStoragePoint())) {
+ String dictType = null;
+ switch (device.getStoragePoint()) {
+ case "鑰佸寲瀹�":
+ dictType = "aging_maintenance_content";
+ break;
+ case "鑰佸寲瀹為獙瀹�":
+ dictType = "aging_maintenance_content";
+ break;
+ case "鐢垫�ц兘瀹為獙瀹�":
+ dictType = "electrical_maintenance_content";
+ break;
+ case "鐜瀹為獙瀹�":
+ dictType = "environmental_maintenance_content";
+ break;
+ case "鐕冪儳瀹為獙瀹�":
+ dictType = "burn_maintenance_content";
+ break;
+ case "娣风偧瀹為獙瀹�":
+ dictType = "mixing_maintenance_content";
+ break;
+ case "妫�娴嬩腑蹇冪數鎬ц兘瀹為獙瀹�":
+ dictType = "center_electrical_maintenance_content";
+ break;
+ case "鎭掓俯浜�":
+ dictType = "temperature2_maintenance_content";
+ break;
+ case "鎭掓俯涓�":
+ dictType = "temperature1_maintenance_content";
+ break;
+ case "鍖栧瀹為獙瀹�":
+ dictType = "chemistry_maintenance_content";
+ break;
+ case "鍒舵牱瀹�":
+ dictType = "sample_maintenance_content";
+ break;
+ case "浣庢俯瀹為獙瀹�":
+ dictType = "hypothermia_maintenance_content";
+ break;
+ }
+ sysDictDataList = iSysDictTypeService.selectDictDataByType(dictType);
+ }
+ return sysDictDataList;
+ }
}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMetricRecordServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMetricRecordServiceImpl.java
index 8ce075f..934f32f 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMetricRecordServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMetricRecordServiceImpl.java
@@ -11,7 +11,7 @@
* 璁惧鏍″噯 - 鏍″噯璁板綍 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-09-27 10:20:01
*/
@Service
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMetricsCopyServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMetricsCopyServiceImpl.java
index 22d1535..b40f600 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMetricsCopyServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMetricsCopyServiceImpl.java
@@ -11,7 +11,7 @@
* 璁惧鏍″噯 - 鏍″噯璁板綍 - 鏍″噯鏉＄洰 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-09-27 10:20:11
*/
@Service
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceOperationInstructionServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceOperationInstructionServiceImpl.java
index 273dd2c..5b0082f 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceOperationInstructionServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceOperationInstructionServiceImpl.java
@@ -14,7 +14,7 @@
* 璁惧 - 浣滀笟鎸囧涔� 娣诲姞鍙楁帶鏂囦欢 瀛� 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-12-04 10:43:32
*/
@Service
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
index 66e5a2a..0cb7415 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
@@ -44,6 +44,7 @@
import java.io.OutputStream;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
@@ -396,11 +397,11 @@
DeviceMaintenance deviceMaintenance = deviceMaintenanceList.get(i);
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
// 缁翠慨鏃ユ湡
- deviceMetricRecordAndMaintenanceDto.setMaintenanceDateString(deviceMaintenance.getDate().format(dateTimeFormatter));
+ deviceMetricRecordAndMaintenanceDto.setMaintenanceDateString(deviceMaintenance.getMaintenanceDate().format(dateTimeFormatter));
// 澶勭悊鏂规硶
- deviceMetricRecordAndMaintenanceDto.setHandlingMethod(deviceMaintenance.getContent());
+ deviceMetricRecordAndMaintenanceDto.setHandlingMethod(deviceMaintenance.getMaintenanceContent());
// 澶囨敞
- deviceMetricRecordAndMaintenanceDto.setComments(deviceMaintenance.getComments());
+ deviceMetricRecordAndMaintenanceDto.setComments(deviceMaintenance.getRemark());
}
deviceMetricRecordAndMaintenanceDtoList.add(deviceMetricRecordAndMaintenanceDto);
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceStateServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceStateServiceImpl.java
index f4f7c5a..4d4a481 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceStateServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceStateServiceImpl.java
@@ -33,7 +33,7 @@
* 璁惧鍋滅敤/鍚敤 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-09-26 09:51:40
*/
@Service
diff --git a/cnas-device/src/main/java/com/ruoyi/device/task/DeviceRecordSchedule.java b/cnas-device/src/main/java/com/ruoyi/device/task/DeviceRecordSchedule.java
index c3597a5..7ead8cb 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/task/DeviceRecordSchedule.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/task/DeviceRecordSchedule.java
@@ -31,7 +31,7 @@
* 鎻愰啋濉啓璁惧浣跨敤璁板綍
*/
// @Scheduled(cron = "0/5 * * * * *")
-// @Scheduled(cron = "0 0 9 * * 6") // 姣忓懆鍏墽琛屼竴娆�
+ @Scheduled(cron = "0 0 9 * * 6") // 姣忓懆鍏墽琛屼竴娆�
public void task1() {
// 鏌ヨ鏈～鍐欑殑璁惧浣跨敤璁板綍
List<DeviceRecordDto> deviceRecords = deviceRecordMapper.selectNotFilled();
diff --git a/cnas-device/src/main/resources/mapper/DeviceBorrowMapper.xml b/cnas-device/src/main/resources/mapper/DeviceBorrowMapper.xml
index bb2454d..4b62f5b 100644
--- a/cnas-device/src/main/resources/mapper/DeviceBorrowMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DeviceBorrowMapper.xml
@@ -6,7 +6,7 @@
select * from (
select db.*,device_name
from device_borrow db
- left join `center-lims`.device on db.device_id=device.id
+ left join device on db.device_id=device.id
)a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
@@ -15,7 +15,7 @@
<select id="getDeviceBorrowBydeviceId" resultType="com.ruoyi.device.pojo.DeviceBorrow">
select db.*,device_name
from device_borrow db
- left join `center-lims`.device on db.device_id=device.id
+ left join device on db.device_id=device.id
where device_id=#{deviceId}
</select>
</mapper>
diff --git a/cnas-device/src/main/resources/mapper/DeviceImpowerDetailsMapper.xml b/cnas-device/src/main/resources/mapper/DeviceImpowerDetailsMapper.xml
new file mode 100644
index 0000000..18b36c6
--- /dev/null
+++ b/cnas-device/src/main/resources/mapper/DeviceImpowerDetailsMapper.xml
@@ -0,0 +1,16 @@
+<?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="com.ruoyi.device.mapper.DeviceImpowerDetailsMapper">
+
+ <!-- 鏌ヨ璁惧浣跨敤璇︽儏 -->
+ <select id="deviceImpowerDetailsList" resultType="com.ruoyi.device.dto.DeviceImpowerDetailsDto">
+ select
+ did.*,
+ d.device_name,
+ d.specification_model,
+ d.management_number
+ from device_impower_details did
+ left join device d on did.device_id = d.id
+ where did.impower_id = #{impowerId}
+ </select>
+</mapper>
diff --git a/cnas-device/src/main/resources/mapper/DeviceImpowerMapper.xml b/cnas-device/src/main/resources/mapper/DeviceImpowerMapper.xml
new file mode 100644
index 0000000..dc9a454
--- /dev/null
+++ b/cnas-device/src/main/resources/mapper/DeviceImpowerMapper.xml
@@ -0,0 +1,14 @@
+<?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="com.ruoyi.device.mapper.DeviceImpowerMapper">
+
+
+ <select id="selectDeviceParameterPage" resultType="com.ruoyi.device.pojo.DeviceImpower">
+ select
+ *
+ from device_impower
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+</mapper>
diff --git a/cnas-device/src/main/resources/mapper/DeviceMaintenanceMapper.xml b/cnas-device/src/main/resources/mapper/DeviceMaintenanceMapper.xml
index 136b242..b6ab4cc 100644
--- a/cnas-device/src/main/resources/mapper/DeviceMaintenanceMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DeviceMaintenanceMapper.xml
@@ -3,4 +3,18 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.device.mapper.DeviceMaintenanceMapper">
+
+ <!-- 璁惧缁存姢鍒嗛〉鏌ヨ -->
+ <select id="selectDeviceMaintenancePage" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
+ select * from (
+ select db.*,
+ d.device_name,
+ d.management_number
+ from device_maintenance db
+ left join device d on db.device_id = d.id)a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ order by maintenance_date desc
+ </select>
</mapper>
diff --git a/cnas-device/src/main/resources/mapper/DeviceTraceabilityManagementDetailsMapper.xml b/cnas-device/src/main/resources/mapper/DeviceTraceabilityManagementDetailsMapper.xml
index 7de51b3..6fc4960 100644
--- a/cnas-device/src/main/resources/mapper/DeviceTraceabilityManagementDetailsMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DeviceTraceabilityManagementDetailsMapper.xml
@@ -7,7 +7,6 @@
select
dtmd.*,
d.device_name,
- d.device_name,
d.specification_model,
d.management_number
from device_traceability_management_details dtmd
diff --git a/cnas-device/src/main/resources/static/word/device-impower.docx b/cnas-device/src/main/resources/static/word/device-impower.docx
new file mode 100644
index 0000000..84f72bd
--- /dev/null
+++ b/cnas-device/src/main/resources/static/word/device-impower.docx
Binary files differ
diff --git a/cnas-device/src/main/resources/static/word/device-maintenance.docx b/cnas-device/src/main/resources/static/word/device-maintenance.docx
new file mode 100644
index 0000000..267a258
--- /dev/null
+++ b/cnas-device/src/main/resources/static/word/device-maintenance.docx
Binary files differ
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java
index 9a715e1..b357a71 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java
@@ -26,7 +26,7 @@
* 鍐呭绠＄悊绾犳澶勭悊琛� 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 04:00:15
*/
@Api(tags = "鍐呭绾犳鎺柦")
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java
index 705bd42..08864d7 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java
@@ -23,7 +23,7 @@
* 鍐呭浼氳琛� 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 02:50:44
*/
@Api(tags = "鍐呭浼氳")
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java
index c3d2c87..16f6cac 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java
@@ -24,7 +24,7 @@
* 鍐呭骞村害璁″垝 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 03:27:47
*/
@Api(tags = "鍐呭骞村害璁″垝")
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageControlPlanListController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageControlPlanListController.java
index 64e7189..9a8fc2d 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageControlPlanListController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageControlPlanListController.java
@@ -28,7 +28,7 @@
* 閲嶅ぇ椋庨櫓鍥犵礌鍒嗘瀽鍙婃帶鍒惰鍒掓竻鍗� 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 02:58:30
*/
@Api(tags = "閲嶅ぇ椋庨櫓鍥犵礌鍒嗘瀽鍙婃帶鍒惰鍒掓竻鍗�")
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentAlterController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentAlterController.java
index 0d5c223..26c9cd4 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentAlterController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentAlterController.java
@@ -24,7 +24,7 @@
* 鏂囦欢鍙樻洿 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-11 11:04:01
*/
@Api(tags = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentCancelController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentCancelController.java
index 9710966..305bdeb 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentCancelController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentCancelController.java
@@ -23,7 +23,7 @@
* 鏂囦欢浣滃簾 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-09 02:37:35
*/
@Api(tags = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentControlledController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentControlledController.java
index 4740b22..a89e3d3 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentControlledController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentControlledController.java
@@ -23,7 +23,7 @@
* 鏂囦欢鍙楁帶 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-08 02:54:44
*/
@Api(tags = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java
index 83b6a28..4d0244f 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java
@@ -24,7 +24,7 @@
* 鏂囦欢鍙戞斁鍥炴敹 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-09 09:18:24
*/
@Api(tags = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentListController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentListController.java
index b480c4f..876496f 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentListController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentListController.java
@@ -27,7 +27,7 @@
鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-08 11:08:11
*/
@Api(tags = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingController.java
index 345b93c..6680ed4 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingController.java
@@ -19,7 +19,7 @@
* 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-11 09:33:47
*/
@Api(tags = "绠＄悊璇勫浼氳")
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingParticipantsController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingParticipantsController.java
index 0fb9c68..1a9ef79 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingParticipantsController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingParticipantsController.java
@@ -18,7 +18,7 @@
* 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-11 09:34:27
*/
@Api(tags = "绠＄悊璇勫浼氳")
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordAuditController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordAuditController.java
index 3a97ec0..cd1a3e6 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordAuditController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordAuditController.java
@@ -23,7 +23,7 @@
* 鏂囦欢淇鐢宠瀹℃壒璁板綍 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-14 10:29:18
*/
@Api(tags = "璁板綍鐨勬帶鍒�")
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java
index 5e94d64..56224d7 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java
@@ -25,7 +25,7 @@
* 浣滃簾鏂囦欢閿�榄傝褰� 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 01:27:22
*/
@Api(tags = "璁板綍鐨勬帶鍒�")
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCheckController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCheckController.java
index ff1c1ac..a5719ab 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCheckController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCheckController.java
@@ -24,7 +24,7 @@
* 鏂囦欢瀹℃壒璁板綍(鍚慨璁㈠悗鍐嶆瀹℃壒璁板綍) 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 02:31:36
*/
@Api(tags = "璁板綍鐨勬帶鍒�")
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsController.java
index 5c66147..cf5067b 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsController.java
@@ -24,7 +24,7 @@
* 鏂囦欢瀹氭湡瀹℃煡璁板綍 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 10:54:31
*/
@Api(tags = "璁板綍鐨勬帶鍒�")
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsTotalController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsTotalController.java
index bb5addd..ac523fd 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsTotalController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsTotalController.java
@@ -21,7 +21,7 @@
* 鏂囦欢瀹氭湡瀹℃煡璁板綍鎬诲巻鍙茶褰曡〃 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 01:12:11
*/
@Api(tags = "璁板綍鐨勬帶鍒�")
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIssueRecycleController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIssueRecycleController.java
index 3278dc1..97a7c40 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIssueRecycleController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIssueRecycleController.java
@@ -24,7 +24,7 @@
* 鎵�鏈夋枃浠�(鍐呫�佸閮ㄦ枃浠�)鐨勫彂鏀句笌鍥炴敹璁板綍 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 09:11:05
*/
@Api(tags = "璁板綍鐨勬帶鍒�")
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordTotalController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordTotalController.java
index 727efea..e4ca1e0 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordTotalController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordTotalController.java
@@ -21,7 +21,7 @@
* 澶栨潵鏂囦欢纭璁板綍鎬诲巻鍙茶褰曡〃 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 10:30:08
*/
@Api(tags = "璁板綍鐨勬帶鍒�")
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordVerifyController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordVerifyController.java
index b9a9f99..21afdc6 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordVerifyController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordVerifyController.java
@@ -23,7 +23,7 @@
* 澶栨潵鏂囦欢纭璁板綍 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 10:29:44
*/
@Api(tags = "璁板綍鐨勬帶鍒�")
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramController.java
index 1bb3064..db63061 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramController.java
@@ -19,7 +19,7 @@
* 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-09 03:05:42
*/
@Api(tags = "绠＄悊璇勫璁″垝")
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramFileController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramFileController.java
index 3b9dfc0..3d6c813 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramFileController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramFileController.java
@@ -19,7 +19,7 @@
* 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-09 04:15:47
*/
@Api(tags = "绠＄悊璇勫璁″垝鏂囦欢")
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewReportController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewReportController.java
index dd8f817..c9c1bd6 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewReportController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewReportController.java
@@ -19,7 +19,7 @@
* 绠＄悊璇勫鎶ュ憡 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 04:44:39
*/
@Api(tags = "绠＄悊璇勫鎶ュ憡")
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRiskAssessmentResultsController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRiskAssessmentResultsController.java
index 0e01a26..ac338e9 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRiskAssessmentResultsController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRiskAssessmentResultsController.java
@@ -33,7 +33,7 @@
* 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙堣〃 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 02:58:51
*/
@Api(tags = "鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙堣〃")
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalCorrectFileMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalCorrectFileMapper.java
index 0a6ae4e..fe9645f 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalCorrectFileMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalCorrectFileMapper.java
@@ -9,7 +9,7 @@
* 鍐呭绠＄悊绾犳鎺柦闄勪欢琛� Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 04:00:38
*/
@Mapper
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalCorrectMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalCorrectMapper.java
index 727e05c..02f02f3 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalCorrectMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalCorrectMapper.java
@@ -13,7 +13,7 @@
* 鍐呭绠＄悊绾犳澶勭悊琛� Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 04:00:15
*/
@Mapper
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalMeetingDetailMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalMeetingDetailMapper.java
index e7dc1e4..ed4ed42 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalMeetingDetailMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalMeetingDetailMapper.java
@@ -8,7 +8,7 @@
* 鍐呭浼氳璇︽儏琛� Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 02:56:13
*/
public interface InternalMeetingDetailMapper extends BaseMapper<InternalMeetingDetail> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalMeetingMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalMeetingMapper.java
index 6980543..82f87ba 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalMeetingMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalMeetingMapper.java
@@ -13,7 +13,7 @@
* 鍐呭浼氳琛� Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 02:50:44
*/
public interface InternalMeetingMapper extends BaseMapper<InternalMeeting> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalPlanDetailMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalPlanDetailMapper.java
index e91be0f..02a0734 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalPlanDetailMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalPlanDetailMapper.java
@@ -9,7 +9,7 @@
* 鍐呭骞村害璁″垝璇︽儏琛� Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 03:28:48
*/
@Mapper
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalPlanMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalPlanMapper.java
index 7a3b16e..60d3bab 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalPlanMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalPlanMapper.java
@@ -14,7 +14,7 @@
* 鍐呭骞村害璁″垝 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 03:27:47
*/
@Mapper
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageControlPlanListMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageControlPlanListMapper.java
index 4585da0..4ef7773 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageControlPlanListMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageControlPlanListMapper.java
@@ -12,7 +12,7 @@
* 閲嶅ぇ椋庨櫓鍥犵礌鍒嗘瀽鍙婃帶鍒惰鍒掓竻鍗� Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 02:58:30
*/
public interface ManageControlPlanListMapper extends BaseMapper<ManageControlPlanList> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentAlterMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentAlterMapper.java
index 0af92ae..ffe8baa 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentAlterMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentAlterMapper.java
@@ -12,7 +12,7 @@
* 鏂囦欢鍙樻洿 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-11 11:04:01
*/
public interface ManageDocumentAlterMapper extends BaseMapper<ManageDocumentAlter> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentCancelMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentCancelMapper.java
index 8fade5a..c97de36 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentCancelMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentCancelMapper.java
@@ -12,7 +12,7 @@
* 鏂囦欢浣滃簾 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-09 02:37:35
*/
public interface ManageDocumentCancelMapper extends BaseMapper<ManageDocumentCancel> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentControlledMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentControlledMapper.java
index 5674813..7ae6501 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentControlledMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentControlledMapper.java
@@ -12,7 +12,7 @@
* 鏂囦欢鍙楁帶 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-08 02:54:44
*/
public interface ManageDocumentControlledMapper extends BaseMapper<ManageDocumentControlled> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentIssueRecycleMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentIssueRecycleMapper.java
index e942c06..1b9c6fa 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentIssueRecycleMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentIssueRecycleMapper.java
@@ -13,7 +13,7 @@
* 鏂囦欢鍙戞斁鍥炴敹 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-09 09:18:24
*/
public interface ManageDocumentIssueRecycleMapper extends BaseMapper<ManageDocumentIssueRecycle> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentListMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentListMapper.java
index 0945cd7..79de39a 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentListMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentListMapper.java
@@ -13,7 +13,7 @@
Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-08 11:08:11
*/
public interface ManageDocumentListMapper extends BaseMapper<ManageDocumentList> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageMeetingMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageMeetingMapper.java
index fc3e29c..2f32c7e 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageMeetingMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageMeetingMapper.java
@@ -12,7 +12,7 @@
* Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-11 09:33:47
*/
public interface ManageMeetingMapper extends BaseMapper<ManageMeeting> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageMeetingParticipantsMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageMeetingParticipantsMapper.java
index 765f5b8..8aecf44 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageMeetingParticipantsMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageMeetingParticipantsMapper.java
@@ -8,7 +8,7 @@
* Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-11 09:34:27
*/
public interface ManageMeetingParticipantsMapper extends BaseMapper<ManageMeetingParticipants> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordAuditMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordAuditMapper.java
index 93cddbd..38ae1e9 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordAuditMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordAuditMapper.java
@@ -12,7 +12,7 @@
* 鏂囦欢淇鐢宠瀹℃壒璁板綍 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-14 10:29:18
*/
public interface ManageRecordAuditMapper extends BaseMapper<ManageRecordAudit> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordCancelMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordCancelMapper.java
index f476625..f0adcd9 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordCancelMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordCancelMapper.java
@@ -12,7 +12,7 @@
* 浣滃簾鏂囦欢閿�榄傝褰� Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 01:27:22
*/
public interface ManageRecordCancelMapper extends BaseMapper<ManageRecordCancel> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordCheckMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordCheckMapper.java
index 09fd3a7..72fa458 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordCheckMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordCheckMapper.java
@@ -12,7 +12,7 @@
* 鏂囦欢瀹℃壒璁板綍(鍚慨璁㈠悗鍐嶆瀹℃壒璁板綍) Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 02:31:36
*/
public interface ManageRecordCheckMapper extends BaseMapper<ManageRecordCheck> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordIntervalsMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordIntervalsMapper.java
index f1ae6e8..743436f 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordIntervalsMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordIntervalsMapper.java
@@ -12,7 +12,7 @@
* 鏂囦欢瀹氭湡瀹℃煡璁板綍 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 10:54:31
*/
public interface ManageRecordIntervalsMapper extends BaseMapper<ManageRecordIntervals> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordIntervalsTotalMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordIntervalsTotalMapper.java
index 563373d..df92dca 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordIntervalsTotalMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordIntervalsTotalMapper.java
@@ -12,7 +12,7 @@
* 鏂囦欢瀹氭湡瀹℃煡璁板綍鎬诲巻鍙茶褰曡〃 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 01:12:11
*/
public interface ManageRecordIntervalsTotalMapper extends BaseMapper<ManageRecordIntervalsTotal> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordIssueRecycleMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordIssueRecycleMapper.java
index 693b833..be532a9 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordIssueRecycleMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordIssueRecycleMapper.java
@@ -12,7 +12,7 @@
* 鎵�鏈夋枃浠�(鍐呫�佸閮ㄦ枃浠�)鐨勫彂鏀句笌鍥炴敹璁板綍 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 09:11:05
*/
public interface ManageRecordIssueRecycleMapper extends BaseMapper<ManageRecordIssueRecycle> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordTotalMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordTotalMapper.java
index 47d349c..5950bd9 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordTotalMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordTotalMapper.java
@@ -12,7 +12,7 @@
* 澶栨潵鏂囦欢纭璁板綍鎬诲巻鍙茶褰曡〃 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 10:30:08
*/
public interface ManageRecordTotalMapper extends BaseMapper<ManageRecordTotal> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordVerifyMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordVerifyMapper.java
index b34e72b..7461cec 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordVerifyMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordVerifyMapper.java
@@ -12,7 +12,7 @@
* 澶栨潵鏂囦欢纭璁板綍 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 10:29:44
*/
public interface ManageRecordVerifyMapper extends BaseMapper<ManageRecordVerify> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageReviewProgramFileMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageReviewProgramFileMapper.java
index d82fcd4..cdacef5 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageReviewProgramFileMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageReviewProgramFileMapper.java
@@ -8,7 +8,7 @@
* Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-09 04:15:47
*/
public interface ManageReviewProgramFileMapper extends BaseMapper<ManageReviewProgramFile> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageReviewProgramMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageReviewProgramMapper.java
index 96c1a29..4a77c8b 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageReviewProgramMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageReviewProgramMapper.java
@@ -11,7 +11,7 @@
* Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-09 03:05:42
*/
public interface ManageReviewProgramMapper extends BaseMapper<ManageReviewProgram> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageReviewReportMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageReviewReportMapper.java
index f7a5a99..a88400b 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageReviewReportMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageReviewReportMapper.java
@@ -11,7 +11,7 @@
* 绠＄悊璇勫鎶ュ憡 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 04:44:39
*/
public interface ManageReviewReportMapper extends BaseMapper<ManageReviewReport> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRiskAssessmentResultsMapper.java b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRiskAssessmentResultsMapper.java
index d512013..7cd9776 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRiskAssessmentResultsMapper.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRiskAssessmentResultsMapper.java
@@ -12,7 +12,7 @@
* 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙堣〃 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 02:58:51
*/
public interface ManageRiskAssessmentResultsMapper extends BaseMapper<ManageRiskAssessmentResults> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalCorrect.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalCorrect.java
index 2adab8e..a39064a 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalCorrect.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalCorrect.java
@@ -13,7 +13,7 @@
* 鍐呭绠＄悊绾犳澶勭悊琛�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 04:00:15
*/
@Data
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalCorrectFile.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalCorrectFile.java
index 1d02b41..b5dd4b6 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalCorrectFile.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalCorrectFile.java
@@ -12,7 +12,7 @@
* 鍐呭绠＄悊绾犳鎺柦闄勪欢琛�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 04:00:38
*/
@Data
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalMeeting.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalMeeting.java
index acc813a..0989a2a 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalMeeting.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalMeeting.java
@@ -12,7 +12,7 @@
* 鍐呭浼氳琛�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 02:50:44
*/
@Data
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalMeetingDetail.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalMeetingDetail.java
index f6f3cb6..bf640f7 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalMeetingDetail.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalMeetingDetail.java
@@ -12,7 +12,7 @@
* 鍐呭浼氳璇︽儏琛�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 02:56:13
*/
@Data
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalPlan.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalPlan.java
index 06e2106..c47165a 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalPlan.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalPlan.java
@@ -12,7 +12,7 @@
* 鍐呭骞村害璁″垝
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 03:27:47
*/
@Data
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalPlanDetail.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalPlanDetail.java
index 8c51e9f..5beaf62 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalPlanDetail.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalPlanDetail.java
@@ -12,7 +12,7 @@
* 鍐呭骞村害璁″垝璇︽儏琛�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 03:28:48
*/
@Data
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageControlPlanList.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageControlPlanList.java
index 7c08c48..f268d2e 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageControlPlanList.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageControlPlanList.java
@@ -17,7 +17,7 @@
* 閲嶅ぇ椋庨櫓鍥犵礌鍒嗘瀽鍙婃帶鍒惰鍒掓竻鍗�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 02:58:30
*/
@Getter
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentAlter.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentAlter.java
index 2d9bc62..032f672 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentAlter.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentAlter.java
@@ -20,7 +20,7 @@
* 鏂囦欢鍙樻洿
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-11 11:04:01
*/
@Getter
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentCancel.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentCancel.java
index d7471d0..9bcc58e 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentCancel.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentCancel.java
@@ -21,7 +21,7 @@
* 鏂囦欢浣滃簾
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-09 02:37:35
*/
@Getter
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentControlled.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentControlled.java
index 77ef4ff..656c87c 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentControlled.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentControlled.java
@@ -20,7 +20,7 @@
* 鏂囦欢鍙楁帶
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-08 02:54:44
*/
@Getter
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentIssueRecycle.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentIssueRecycle.java
index 1828ef5..d0c0378 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentIssueRecycle.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentIssueRecycle.java
@@ -21,7 +21,7 @@
* 鏂囦欢鍙戞斁鍥炴敹
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-09 09:18:24
*/
@Getter
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentList.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentList.java
index 57f6f1b..ff8f98d 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentList.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentList.java
@@ -21,7 +21,7 @@
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-08 11:08:11
*/
@Getter
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageMeeting.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageMeeting.java
index 250e410..a61aaa1 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageMeeting.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageMeeting.java
@@ -14,7 +14,7 @@
*
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-11 09:33:47
*/
@Getter
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageMeetingParticipants.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageMeetingParticipants.java
index c86b0da..b506ff0 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageMeetingParticipants.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageMeetingParticipants.java
@@ -14,7 +14,7 @@
*
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-11 09:34:27
*/
@Getter
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordAudit.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordAudit.java
index c4d6e0d..f5aabfc 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordAudit.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordAudit.java
@@ -20,7 +20,7 @@
* 鏂囦欢淇鐢宠瀹℃壒璁板綍
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-14 10:29:18
*/
@Getter
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordCancel.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordCancel.java
index 76137b4..4ee2516 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordCancel.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordCancel.java
@@ -19,7 +19,7 @@
* 浣滃簾鏂囦欢閿�榄傝褰�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 01:27:22
*/
@Getter
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordCheck.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordCheck.java
index b9bbc97..1957434 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordCheck.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordCheck.java
@@ -21,7 +21,7 @@
* 鏂囦欢瀹℃壒璁板綍(鍚慨璁㈠悗鍐嶆瀹℃壒璁板綍)
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 02:31:36
*/
@Getter
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordIntervals.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordIntervals.java
index deb7195..982a901 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordIntervals.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordIntervals.java
@@ -16,7 +16,7 @@
* 鏂囦欢瀹氭湡瀹℃煡璁板綍
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 10:54:31
*/
@Getter
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordIntervalsTotal.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordIntervalsTotal.java
index 2b694c8..98be8d3 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordIntervalsTotal.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordIntervalsTotal.java
@@ -21,7 +21,7 @@
* 鏂囦欢瀹氭湡瀹℃煡璁板綍鎬诲巻鍙茶褰曡〃
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 01:12:11
*/
@Getter
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordIssueRecycle.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordIssueRecycle.java
index b93ad4c..ae1ee74 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordIssueRecycle.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordIssueRecycle.java
@@ -21,7 +21,7 @@
* 鎵�鏈夋枃浠�(鍐呫�佸閮ㄦ枃浠�)鐨勫彂鏀句笌鍥炴敹璁板綍
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 09:11:05
*/
@Getter
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordTotal.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordTotal.java
index 0d5f343..0e5d8de 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordTotal.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordTotal.java
@@ -21,7 +21,7 @@
* 澶栨潵鏂囦欢纭璁板綍鎬诲巻鍙茶褰曡〃
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 10:30:08
*/
@Getter
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordVerify.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordVerify.java
index a171296..55d807c 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordVerify.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordVerify.java
@@ -20,7 +20,7 @@
* 澶栨潵鏂囦欢纭璁板綍
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 10:29:44
*/
@Getter
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageReviewProgram.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageReviewProgram.java
index d78f41b..fc20054 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageReviewProgram.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageReviewProgram.java
@@ -14,7 +14,7 @@
*
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-09 03:05:42
*/
@Getter
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageReviewProgramFile.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageReviewProgramFile.java
index cac35ce..9ed78a4 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageReviewProgramFile.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageReviewProgramFile.java
@@ -14,7 +14,7 @@
*
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-09 04:15:47
*/
@Getter
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageReviewReport.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageReviewReport.java
index 648d7e7..cd19354 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageReviewReport.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageReviewReport.java
@@ -14,7 +14,7 @@
* 绠＄悊璇勫鎶ュ憡
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 04:44:39
*/
@Getter
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRiskAssessmentResults.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRiskAssessmentResults.java
index 24b2f31..043f406 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRiskAssessmentResults.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRiskAssessmentResults.java
@@ -18,7 +18,7 @@
* 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙堣〃
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 02:58:51
*/
@Getter
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/schedule/ManageRecordTotalSchedule.java b/cnas-manage/src/main/java/com/ruoyi/manage/schedule/ManageRecordTotalSchedule.java
index 040406a..6cd870e 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/schedule/ManageRecordTotalSchedule.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/schedule/ManageRecordTotalSchedule.java
@@ -20,7 +20,7 @@
@Resource
private ManageRecordIntervalsTotalService manageRecordIntervalsTotalService;
-// @Scheduled(cron = "0 0 2 1 1 ?") //姣忓勾1鏈�1鍙�2鐐�
+ @Scheduled(cron = "0 0 2 1 1 ?") //姣忓勾1鏈�1鍙�2鐐�
public void manageRecordTotal() {
ManageRecordTotal manageRecordTotal = new ManageRecordTotal();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/InternalCorrectFileService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/InternalCorrectFileService.java
index 630c7c5..4d7b983 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/InternalCorrectFileService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/InternalCorrectFileService.java
@@ -8,7 +8,7 @@
* 鍐呭绠＄悊绾犳鎺柦闄勪欢琛� 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 04:00:38
*/
public interface InternalCorrectFileService extends IService<InternalCorrectFile> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/InternalCorrectService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/InternalCorrectService.java
index de59e8c..6a93307 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/InternalCorrectService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/InternalCorrectService.java
@@ -15,7 +15,7 @@
* 鍐呭绠＄悊绾犳澶勭悊琛� 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 04:00:15
*/
public interface InternalCorrectService extends IService<InternalCorrect> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/InternalMeetingDetailService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/InternalMeetingDetailService.java
index 9878594..85b49a5 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/InternalMeetingDetailService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/InternalMeetingDetailService.java
@@ -8,7 +8,7 @@
* 鍐呭浼氳璇︽儏琛� 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 02:56:13
*/
public interface InternalMeetingDetailService extends IService<InternalMeetingDetail> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/InternalMeetingService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/InternalMeetingService.java
index 39f476f..5cc5e38 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/InternalMeetingService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/InternalMeetingService.java
@@ -13,7 +13,7 @@
* 鍐呭浼氳琛� 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 02:50:44
*/
public interface InternalMeetingService extends IService<InternalMeeting> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/InternalPlanDetailService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/InternalPlanDetailService.java
index 4cb521f..a433943 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/InternalPlanDetailService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/InternalPlanDetailService.java
@@ -8,7 +8,7 @@
* 鍐呭骞村害璁″垝璇︽儏琛� 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 03:28:48
*/
public interface InternalPlanDetailService extends IService<InternalPlanDetail> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/InternalPlanService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/InternalPlanService.java
index f3ceb41..e769ebd 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/InternalPlanService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/InternalPlanService.java
@@ -13,7 +13,7 @@
* 鍐呭骞村害璁″垝 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 03:27:47
*/
public interface InternalPlanService extends IService<InternalPlan> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageControlPlanListService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageControlPlanListService.java
index 4f92344..0004e70 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageControlPlanListService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageControlPlanListService.java
@@ -13,7 +13,7 @@
* 閲嶅ぇ椋庨櫓鍥犵礌鍒嗘瀽鍙婃帶鍒惰鍒掓竻鍗� 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 02:58:30
*/
public interface ManageControlPlanListService extends IService<ManageControlPlanList> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentAlterService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentAlterService.java
index 6fc706a..512c917 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentAlterService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentAlterService.java
@@ -13,7 +13,7 @@
* 鏂囦欢鍙樻洿 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-11 11:04:01
*/
public interface ManageDocumentAlterService extends IService<ManageDocumentAlter> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentCancelService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentCancelService.java
index 541beb6..a64e75c 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentCancelService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentCancelService.java
@@ -13,7 +13,7 @@
* 鏂囦欢浣滃簾 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-09 02:37:35
*/
public interface ManageDocumentCancelService extends IService<ManageDocumentCancel> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentControlledService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentControlledService.java
index b252cfa..8359ccb 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentControlledService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentControlledService.java
@@ -13,7 +13,7 @@
* 鏂囦欢鍙楁帶 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-08 02:54:44
*/
public interface ManageDocumentControlledService extends IService<ManageDocumentControlled> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentIssueRecycleService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentIssueRecycleService.java
index de41b15..6249f30 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentIssueRecycleService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentIssueRecycleService.java
@@ -14,7 +14,7 @@
* 鏂囦欢鍙戞斁鍥炴敹 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-09 09:18:24
*/
public interface ManageDocumentIssueRecycleService extends IService<ManageDocumentIssueRecycle> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentListService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentListService.java
index f946228..545f8d1 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentListService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentListService.java
@@ -15,7 +15,7 @@
鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-08 11:08:11
*/
public interface ManageDocumentListService extends IService<ManageDocumentList> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageMeetingParticipantsService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageMeetingParticipantsService.java
index d1800bf..9bb6679 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageMeetingParticipantsService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageMeetingParticipantsService.java
@@ -9,7 +9,7 @@
* 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-11 09:34:27
*/
public interface ManageMeetingParticipantsService extends IService<ManageMeetingParticipants> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageMeetingService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageMeetingService.java
index 19b277f..cab6f6b 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageMeetingService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageMeetingService.java
@@ -13,7 +13,7 @@
* 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-11 09:33:47
*/
public interface ManageMeetingService extends IService<ManageMeeting> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordAuditService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordAuditService.java
index 1154b05..7a1fa0d 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordAuditService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordAuditService.java
@@ -13,7 +13,7 @@
* 鏂囦欢淇鐢宠瀹℃壒璁板綍 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-14 10:29:18
*/
public interface ManageRecordAuditService extends IService<ManageRecordAudit> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCancelService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCancelService.java
index 3d5b4ff..b86b1b0 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCancelService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCancelService.java
@@ -14,7 +14,7 @@
* 浣滃簾鏂囦欢閿�榄傝褰� 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 01:27:22
*/
public interface ManageRecordCancelService extends IService<ManageRecordCancel> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCheckService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCheckService.java
index 78a0bc1..04021b5 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCheckService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCheckService.java
@@ -14,7 +14,7 @@
* 鏂囦欢瀹℃壒璁板綍(鍚慨璁㈠悗鍐嶆瀹℃壒璁板綍) 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 02:31:36
*/
public interface ManageRecordCheckService extends IService<ManageRecordCheck> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsService.java
index a09519a..c9d9bc2 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsService.java
@@ -14,7 +14,7 @@
* 鏂囦欢瀹氭湡瀹℃煡璁板綍 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 10:54:31
*/
public interface ManageRecordIntervalsService extends IService<ManageRecordIntervals> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsTotalService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsTotalService.java
index bfa40ee..c40a76f 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsTotalService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsTotalService.java
@@ -12,7 +12,7 @@
* 鏂囦欢瀹氭湡瀹℃煡璁板綍鎬诲巻鍙茶褰曡〃 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 01:12:11
*/
public interface ManageRecordIntervalsTotalService extends IService<ManageRecordIntervalsTotal> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIssueRecycleService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIssueRecycleService.java
index 66cd965..ec1af90 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIssueRecycleService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIssueRecycleService.java
@@ -14,7 +14,7 @@
* 鎵�鏈夋枃浠�(鍐呫�佸閮ㄦ枃浠�)鐨勫彂鏀句笌鍥炴敹璁板綍 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 09:11:05
*/
public interface ManageRecordIssueRecycleService extends IService<ManageRecordIssueRecycle> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordTotalService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordTotalService.java
index c757186..26b994b 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordTotalService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordTotalService.java
@@ -12,7 +12,7 @@
* 澶栨潵鏂囦欢纭璁板綍鎬诲巻鍙茶褰曡〃 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 10:30:08
*/
public interface ManageRecordTotalService extends IService<ManageRecordTotal> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordVerifyService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordVerifyService.java
index eb195f1..effbc17 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordVerifyService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordVerifyService.java
@@ -13,7 +13,7 @@
* 澶栨潵鏂囦欢纭璁板綍 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 10:29:44
*/
public interface ManageRecordVerifyService extends IService<ManageRecordVerify> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageReviewProgramFileService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageReviewProgramFileService.java
index 63c1c27..f3b88d1 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageReviewProgramFileService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageReviewProgramFileService.java
@@ -10,7 +10,7 @@
* 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-09 04:15:47
*/
public interface ManageReviewProgramFileService extends IService<ManageReviewProgramFile> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageReviewProgramService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageReviewProgramService.java
index 2c51c76..e15b1e6 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageReviewProgramService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageReviewProgramService.java
@@ -12,7 +12,7 @@
* 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-09 03:05:42
*/
public interface ManageReviewProgramService extends IService<ManageReviewProgram> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageReviewReportService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageReviewReportService.java
index 43152a4..dd8afe6 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageReviewReportService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageReviewReportService.java
@@ -12,7 +12,7 @@
* 绠＄悊璇勫鎶ュ憡 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 04:44:39
*/
public interface ManageReviewReportService extends IService<ManageReviewReport> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRiskAssessmentResultsService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRiskAssessmentResultsService.java
index e8961e9..921b6b0 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRiskAssessmentResultsService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRiskAssessmentResultsService.java
@@ -13,7 +13,7 @@
* 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙堣〃 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 02:58:51
*/
public interface ManageRiskAssessmentResultsService extends IService<ManageRiskAssessmentResults> {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalCorrectFileServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalCorrectFileServiceImpl.java
index 79adf61..55ff0b7 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalCorrectFileServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalCorrectFileServiceImpl.java
@@ -11,7 +11,7 @@
* 鍐呭绠＄悊绾犳鎺柦闄勪欢琛� 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 04:00:38
*/
@Service
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalCorrectServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalCorrectServiceImpl.java
index 7c8c7e1..79f778d 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalCorrectServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalCorrectServiceImpl.java
@@ -43,7 +43,7 @@
* 鍐呭绠＄悊绾犳澶勭悊琛� 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 04:00:15
*/
@Service
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalMeetingDetailServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalMeetingDetailServiceImpl.java
index 0138b51..bc60750 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalMeetingDetailServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalMeetingDetailServiceImpl.java
@@ -11,7 +11,7 @@
* 鍐呭浼氳璇︽儏琛� 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 02:56:13
*/
@Service
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalMeetingServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalMeetingServiceImpl.java
index 92d2a4c..b153746 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalMeetingServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalMeetingServiceImpl.java
@@ -39,7 +39,7 @@
* 鍐呭浼氳琛� 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 02:50:44
*/
@Service
@@ -48,7 +48,7 @@
public class InternalMeetingServiceImpl extends ServiceImpl<InternalMeetingMapper, InternalMeeting> implements InternalMeetingService {
private InternalMeetingDetailService internalMeetingDetailService;
-
+
private UserMapper userMapper;
/**
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalPlanDetailServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalPlanDetailServiceImpl.java
index 3712663..c0b310a 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalPlanDetailServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalPlanDetailServiceImpl.java
@@ -11,7 +11,7 @@
* 鍐呭骞村害璁″垝璇︽儏琛� 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 03:28:48
*/
@Service
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalPlanServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalPlanServiceImpl.java
index 3238a81..782d78c 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalPlanServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalPlanServiceImpl.java
@@ -44,7 +44,7 @@
* 鍐呭骞村害璁″垝 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 03:27:47
*/
@Service
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageControlPlanListServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageControlPlanListServiceImpl.java
index 9289ac5..0b72764 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageControlPlanListServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageControlPlanListServiceImpl.java
@@ -35,7 +35,7 @@
* 閲嶅ぇ椋庨櫓鍥犵礌鍒嗘瀽鍙婃帶鍒惰鍒掓竻鍗� 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 02:58:30
*/
@Service
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentAlterServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentAlterServiceImpl.java
index 009c780..e430764 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentAlterServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentAlterServiceImpl.java
@@ -42,7 +42,7 @@
* 鏂囦欢鍙樻洿 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-11 11:04:01
*/
@Service
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentCancelServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentCancelServiceImpl.java
index 619c864..a357293 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentCancelServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentCancelServiceImpl.java
@@ -38,7 +38,7 @@
* 鏂囦欢浣滃簾 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-09 02:37:35
*/
@Service
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentControlledServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentControlledServiceImpl.java
index e7e0075..dd32fa2 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentControlledServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentControlledServiceImpl.java
@@ -34,7 +34,7 @@
* 鏂囦欢鍙楁帶 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-08 02:54:44
*/
@Service
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentIssueRecycleServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentIssueRecycleServiceImpl.java
index 766333e..6963261 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentIssueRecycleServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentIssueRecycleServiceImpl.java
@@ -41,7 +41,7 @@
* 鏂囦欢鍙戞斁鍥炴敹 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-09 09:18:24
*/
@Service
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentListServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentListServiceImpl.java
index 819a5b9..28986ff 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentListServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentListServiceImpl.java
@@ -36,7 +36,7 @@
* 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-08 11:08:11
*/
@Service
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageMeetingParticipantsServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageMeetingParticipantsServiceImpl.java
index b477e76..e7532c3 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageMeetingParticipantsServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageMeetingParticipantsServiceImpl.java
@@ -18,7 +18,7 @@
* 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-11 09:34:27
*/
@Service
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageMeetingServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageMeetingServiceImpl.java
index f111a81..ee7d236 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageMeetingServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageMeetingServiceImpl.java
@@ -38,7 +38,7 @@
* 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-11 09:33:47
*/
@Service
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordAuditServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordAuditServiceImpl.java
index 52cf02d..96de123 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordAuditServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordAuditServiceImpl.java
@@ -43,7 +43,7 @@
* 鏂囦欢淇鐢宠瀹℃壒璁板綍 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-14 10:29:18
*/
@Service
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCancelServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCancelServiceImpl.java
index d466c02..8e275d8 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCancelServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCancelServiceImpl.java
@@ -46,7 +46,7 @@
* 浣滃簾鏂囦欢閿�榄傝褰� 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 01:27:22
*/
@Service
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCheckServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCheckServiceImpl.java
index 47eda59..6262781 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCheckServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCheckServiceImpl.java
@@ -48,7 +48,7 @@
* 鏂囦欢瀹℃壒璁板綍(鍚慨璁㈠悗鍐嶆瀹℃壒璁板綍) 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 02:31:36
*/
@Service
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsServiceImpl.java
index d1ce9ea..1a4ccb0 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsServiceImpl.java
@@ -44,7 +44,7 @@
* 鏂囦欢瀹氭湡瀹℃煡璁板綍 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 10:54:31
*/
@Service
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsTotalServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsTotalServiceImpl.java
index 62f6b35..25d1c94 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsTotalServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsTotalServiceImpl.java
@@ -46,7 +46,7 @@
* 鏂囦欢瀹氭湡瀹℃煡璁板綍鎬诲巻鍙茶褰曡〃 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 01:12:11
*/
@Service
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIssueRecycleServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIssueRecycleServiceImpl.java
index 109a595..c04acc4 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIssueRecycleServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIssueRecycleServiceImpl.java
@@ -46,7 +46,7 @@
* 鎵�鏈夋枃浠�(鍐呫�佸閮ㄦ枃浠�)鐨勫彂鏀句笌鍥炴敹璁板綍 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 09:11:05
*/
@Service
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordTotalServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordTotalServiceImpl.java
index 1d8260e..53da1f2 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordTotalServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordTotalServiceImpl.java
@@ -48,7 +48,7 @@
* 澶栨潵鏂囦欢纭璁板綍鎬诲巻鍙茶褰曡〃 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 10:30:08
*/
@Service
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordVerifyServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordVerifyServiceImpl.java
index 043e911..2f18ecf 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordVerifyServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordVerifyServiceImpl.java
@@ -37,7 +37,7 @@
* 澶栨潵鏂囦欢纭璁板綍 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 10:29:44
*/
@Service
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewProgramFileServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewProgramFileServiceImpl.java
index 4bc7155..b1ce6c3 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewProgramFileServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewProgramFileServiceImpl.java
@@ -22,7 +22,7 @@
* 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-09 04:15:47
*/
@Service
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewProgramServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewProgramServiceImpl.java
index 1fb3bf9..d033c97 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewProgramServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewProgramServiceImpl.java
@@ -35,7 +35,7 @@
* 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-09 03:05:42
*/
@Service
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewReportServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewReportServiceImpl.java
index e1ad1f1..887c79f 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewReportServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewReportServiceImpl.java
@@ -33,7 +33,7 @@
* 绠＄悊璇勫鎶ュ憡 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 04:44:39
*/
@Service
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java
index 091a66d..dd7a9cb 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java
@@ -30,7 +30,7 @@
* 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙堣〃 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 02:58:51
*/
@Service
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonCommunicationAbilityController.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonCommunicationAbilityController.java
index 6fa8de7..d518906 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonCommunicationAbilityController.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonCommunicationAbilityController.java
@@ -18,7 +18,7 @@
* 娌熼�氳褰� 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-09 12:00:57
*/
@Api(tags = "浜哄憳 - 娌熼�氳褰�")
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonJobResponsibilitiesController.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonJobResponsibilitiesController.java
index f91692b..61cca64 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonJobResponsibilitiesController.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonJobResponsibilitiesController.java
@@ -18,7 +18,7 @@
* 宀椾綅鑱岃矗 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-09 02:07:49
*/
@Api(tags = "浜哄憳 - 宀椾綅鑱岃矗")
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPersonnelCapacityController.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPersonnelCapacityController.java
index 220493f..cae8117 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPersonnelCapacityController.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPersonnelCapacityController.java
@@ -21,7 +21,7 @@
* 浜哄憳鑳藉姏 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-10 11:26:18
*/
@Api(tags = "浜哄憳 - 浜哄憳鑳藉姏")
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPostAuthorizationRecordController.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPostAuthorizationRecordController.java
index aba3e7a..ae327c4 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPostAuthorizationRecordController.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPostAuthorizationRecordController.java
@@ -19,7 +19,7 @@
* 浠昏亴鎺堟潈璁板綍 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-09 10:48:17
*/
@Api(tags = "浜哄憳 - 浠昏亴鎺堟潈璁板綍")
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonRewardPunishmentRecordController.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonRewardPunishmentRecordController.java
index 72f4e43..a60c9ac 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonRewardPunishmentRecordController.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonRewardPunishmentRecordController.java
@@ -26,7 +26,7 @@
* 濂栨儵璁板綍 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-08 11:25:02
*/
@Api(tags = "浜哄憳 - 濂栨儵璁板綍")
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java
index 203d834..d380278 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java
@@ -32,7 +32,7 @@
* 鍩硅璁″垝 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-11 01:11:49
*/
@Api(tags = "浜哄憳 - 鍩硅璁″垝")
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingRecordController.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingRecordController.java
index 5385869..1c76b0b 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingRecordController.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingRecordController.java
@@ -20,7 +20,7 @@
* 鍩硅璁″垝 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-11 01:11:49
*/
@Api(tags = "浜哄憳 - 鍩硅璁板綍")
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonCommunicationAbilityMapper.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonCommunicationAbilityMapper.java
index 0888b35..b309b95 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonCommunicationAbilityMapper.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonCommunicationAbilityMapper.java
@@ -12,7 +12,7 @@
* 娌熼�氳兘鍔� Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-09 12:00:57
*/
public interface PersonCommunicationAbilityMapper extends BaseMapper<PersonCommunicationAbility> {
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonJobResponsibilitiesMapper.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonJobResponsibilitiesMapper.java
index 948c100..cf13fd2 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonJobResponsibilitiesMapper.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonJobResponsibilitiesMapper.java
@@ -12,7 +12,7 @@
* 宀椾綅鑱岃矗 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-09 02:07:49
*/
public interface PersonJobResponsibilitiesMapper extends BaseMapper<PersonJobResponsibilities> {
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonPersonnelCapacityMapper.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonPersonnelCapacityMapper.java
index 71c7246..4574a32 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonPersonnelCapacityMapper.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonPersonnelCapacityMapper.java
@@ -13,7 +13,7 @@
* 浜哄憳鑳藉姏 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-10 11:26:18
*/
public interface PersonPersonnelCapacityMapper extends BaseMapper<PersonPersonnelCapacity> {
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonPostAuthorizationRecordMapper.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonPostAuthorizationRecordMapper.java
index 25e4906..a10a7e7 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonPostAuthorizationRecordMapper.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonPostAuthorizationRecordMapper.java
@@ -12,7 +12,7 @@
* 浠昏亴鎺堟潈璁板綍 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-09 10:48:17
*/
public interface PersonPostAuthorizationRecordMapper extends BaseMapper<PersonPostAuthorizationRecord> {
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonRewardPunishmentRecordMapper.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonRewardPunishmentRecordMapper.java
index bc99f12..b0633b3 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonRewardPunishmentRecordMapper.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonRewardPunishmentRecordMapper.java
@@ -16,7 +16,7 @@
* 濂栨儵璁板綍 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-08 11:25:02
*/
public interface PersonRewardPunishmentRecordMapper extends BaseMapper<PersonRewardPunishmentRecord> {
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingDetailedMapper.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingDetailedMapper.java
index 0fa5306..2802d6e 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingDetailedMapper.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingDetailedMapper.java
@@ -14,7 +14,7 @@
* 鍩硅璁″垝璇︽儏 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-11 01:46:27
*/
public interface PersonTrainingDetailedMapper extends MyBaseMapper<PersonTrainingDetailed> {
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingMapper.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingMapper.java
index 1798f6c..d10c5b4 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingMapper.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingMapper.java
@@ -12,7 +12,7 @@
* 鍩硅璁″垝 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-11 01:11:49
*/
public interface PersonTrainingMapper extends BaseMapper<PersonTraining> {
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingRecordMapper.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingRecordMapper.java
index 7c08bf7..f0ddb1d 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingRecordMapper.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingRecordMapper.java
@@ -16,7 +16,7 @@
* 鍩硅璁板綍 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-12 04:50:48
*/
public interface PersonTrainingRecordMapper extends BaseMapper<PersonTrainingRecord> {
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonCommunicationAbility.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonCommunicationAbility.java
index 4df192d..ee32b13 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonCommunicationAbility.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonCommunicationAbility.java
@@ -15,7 +15,7 @@
* 娌熼�氳褰�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-09 12:00:57
*/
@Getter
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonJobResponsibilities.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonJobResponsibilities.java
index 55536fb..4e13e06 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonJobResponsibilities.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonJobResponsibilities.java
@@ -14,7 +14,7 @@
* 宀椾綅鑱岃矗
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-09 02:07:49
*/
@Getter
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonPersonnelCapacity.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonPersonnelCapacity.java
index b7103f0..b332d7b 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonPersonnelCapacity.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonPersonnelCapacity.java
@@ -14,7 +14,7 @@
* 浜哄憳鑳藉姏
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-10 11:26:18
*/
@Getter
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonPostAuthorizationRecord.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonPostAuthorizationRecord.java
index f341b83..cb7e224 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonPostAuthorizationRecord.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonPostAuthorizationRecord.java
@@ -14,7 +14,7 @@
* 浠昏亴鎺堟潈璁板綍
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-09 10:48:17
*/
@Getter
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonRewardPunishmentRecord.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonRewardPunishmentRecord.java
index ab8bea1..93f0262 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonRewardPunishmentRecord.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonRewardPunishmentRecord.java
@@ -14,7 +14,7 @@
* 濂栨儵璁板綍
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-08 11:25:02
*/
@Getter
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonTraining.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonTraining.java
index 526d947..1e574c3 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonTraining.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonTraining.java
@@ -14,7 +14,7 @@
* 鍩硅璁″垝
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-11 01:11:49
*/
@Getter
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonTrainingDetailed.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonTrainingDetailed.java
index cac8233..81b5338 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonTrainingDetailed.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonTrainingDetailed.java
@@ -15,7 +15,7 @@
* 鍩硅璁″垝璇︽儏
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-11 01:46:27
*/
@Getter
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonTrainingRecord.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonTrainingRecord.java
index 593941b..74a5fab 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonTrainingRecord.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonTrainingRecord.java
@@ -15,7 +15,7 @@
* 鍩硅璁板綍
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-12 04:50:48
*/
@Getter
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonCommunicationAbilityService.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonCommunicationAbilityService.java
index a5186be..49884ce 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonCommunicationAbilityService.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonCommunicationAbilityService.java
@@ -13,7 +13,7 @@
* 娌熼�氳兘鍔� 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-09 12:00:57
*/
public interface PersonCommunicationAbilityService extends IService<PersonCommunicationAbility> {
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonJobResponsibilitiesService.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonJobResponsibilitiesService.java
index 2afa074..0919ff5 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonJobResponsibilitiesService.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonJobResponsibilitiesService.java
@@ -13,7 +13,7 @@
* 宀椾綅鑱岃矗 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-09 02:07:49
*/
public interface PersonJobResponsibilitiesService extends IService<PersonJobResponsibilities> {
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonPersonnelCapacityService.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonPersonnelCapacityService.java
index dfff72a..0e3cc4e 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonPersonnelCapacityService.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonPersonnelCapacityService.java
@@ -13,7 +13,7 @@
* 浜哄憳鑳藉姏 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-10 11:26:18
*/
public interface PersonPersonnelCapacityService extends IService<PersonPersonnelCapacity> {
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonPostAuthorizationRecordService.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonPostAuthorizationRecordService.java
index 3c23bfe..1922f69 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonPostAuthorizationRecordService.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonPostAuthorizationRecordService.java
@@ -13,7 +13,7 @@
* 浠昏亴鎺堟潈璁板綍 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-09 10:48:17
*/
public interface PersonPostAuthorizationRecordService extends IService<PersonPostAuthorizationRecord> {
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonRewardPunishmentRecordService.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonRewardPunishmentRecordService.java
index 0f2dfdc..ecb6fa1 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonRewardPunishmentRecordService.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonRewardPunishmentRecordService.java
@@ -15,7 +15,7 @@
* 濂栨儵璁板綍 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-08 11:25:02
*/
public interface PersonRewardPunishmentRecordService extends IService<PersonRewardPunishmentRecord> {
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingDetailedService.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingDetailedService.java
index f5f52dc..454914c 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingDetailedService.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingDetailedService.java
@@ -14,7 +14,7 @@
* 鍩硅璁″垝璇︽儏 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-11 01:46:27
*/
public interface PersonTrainingDetailedService extends IService<PersonTrainingDetailed> {
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingRecordService.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingRecordService.java
index 265dca6..bc4b82e 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingRecordService.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingRecordService.java
@@ -17,7 +17,7 @@
* 鍩硅璁板綍 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-12 04:50:48
*/
public interface PersonTrainingRecordService extends IService<PersonTrainingRecord> {
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingService.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingService.java
index 46e3fab..e721461 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingService.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingService.java
@@ -17,7 +17,7 @@
* 鍩硅璁″垝 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-11 01:11:49
*/
public interface PersonTrainingService extends IService<PersonTraining> {
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonCommunicationAbilityServiceImpl.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonCommunicationAbilityServiceImpl.java
index 2c1a227..9a80942 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonCommunicationAbilityServiceImpl.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonCommunicationAbilityServiceImpl.java
@@ -31,7 +31,7 @@
* 娌熼�氳兘鍔� 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-09 12:00:57
*/
@Service
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonJobResponsibilitiesServiceImpl.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonJobResponsibilitiesServiceImpl.java
index d55a3f0..225f3cc 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonJobResponsibilitiesServiceImpl.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonJobResponsibilitiesServiceImpl.java
@@ -29,7 +29,7 @@
* 宀椾綅鑱岃矗 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-09 02:07:49
*/
@Service
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonPersonnelCapacityServiceImpl.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonPersonnelCapacityServiceImpl.java
index d835099..3e4f0b4 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonPersonnelCapacityServiceImpl.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonPersonnelCapacityServiceImpl.java
@@ -39,7 +39,7 @@
* 浜哄憳鑳藉姏 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-10 11:26:18
*/
@Service
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonPostAuthorizationRecordServiceImpl.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonPostAuthorizationRecordServiceImpl.java
index 68f2961..fee084e 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonPostAuthorizationRecordServiceImpl.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonPostAuthorizationRecordServiceImpl.java
@@ -31,7 +31,7 @@
* 浠昏亴鎺堟潈璁板綍 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-09 10:48:17
*/
@Service
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonRewardPunishmentRecordServiceImpl.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonRewardPunishmentRecordServiceImpl.java
index 9393bbd..ed82a41 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonRewardPunishmentRecordServiceImpl.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonRewardPunishmentRecordServiceImpl.java
@@ -18,7 +18,7 @@
* 濂栨儵璁板綍 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-08 11:25:02
*/
@Service
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingDetailedServiceImpl.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingDetailedServiceImpl.java
index 3eaf942..7c05355 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingDetailedServiceImpl.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingDetailedServiceImpl.java
@@ -29,7 +29,7 @@
* 鍩硅璁″垝璇︽儏 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-11 01:46:27
*/
@Service
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingRecordServiceImpl.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingRecordServiceImpl.java
index 7ec9037..7dfe566 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingRecordServiceImpl.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingRecordServiceImpl.java
@@ -41,7 +41,7 @@
* 鍩硅璁板綍 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-12 04:50:48
*/
@Transactional(rollbackFor = Exception.class)
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java
index 39218db..a573627 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java
@@ -62,7 +62,7 @@
* 鍩硅璁″垝 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-11 01:11:49
*/
@Service
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/task/PersonTrainingSchedule.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/task/PersonTrainingSchedule.java
index 1144e06..4e87b34 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/task/PersonTrainingSchedule.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/task/PersonTrainingSchedule.java
@@ -31,7 +31,7 @@
* 鎻愰啋濉啓璁惧浣跨敤璁板綍
*/
// @Scheduled(cron = "0/5 * * * * *")
-// @Scheduled(cron = "0 0 9 1 * *") // 姣忔湀涓�鍙锋墽琛�
+ @Scheduled(cron = "0 0 9 1 * *") // 姣忔湀涓�鍙锋墽琛�
public void task1() {
// 鏌ヨ褰撴湀鍩硅璁″垝
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.M");
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/InconsistentDistributionController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/InconsistentDistributionController.java
index c561ddd..cda73b3 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/InconsistentDistributionController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/InconsistentDistributionController.java
@@ -19,7 +19,7 @@
* 涓嶇鍚堥」鐨勫垎甯� 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 09:53:20
*/
@Api(tags = "涓嶇鍚堥」鐨勫垎甯�")
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessComplainController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessComplainController.java
index e5c9add..87da6d9 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessComplainController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessComplainController.java
@@ -18,7 +18,7 @@
* 鎶曡瘔 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-02 09:29:11
*/
@RestController
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessDealController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessDealController.java
index 15ac088..e04b93b 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessDealController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessDealController.java
@@ -1,5 +1,6 @@
package com.ruoyi.process.controller;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.utils.JackSonUtil;
@@ -17,7 +18,7 @@
* 妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃� 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-02 02:50:19
*/
@RestController
@@ -28,34 +29,23 @@
@Resource
private ProcessDealService processDealService;
- @ApiOperation(value = "鏌ヨ妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃鎯�")
- @GetMapping("/pageProcessDeal")
- public Result pageProcessDeal(ProcessDeal processDeal, Page page) throws Exception {
- return Result.success(processDealService.pageProcessDeal(page, processDeal));
- }
-
@ApiOperation(value = "鏂板妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�")
@PostMapping("/addProcessDeal")
public Result addProcessDeal(@RequestBody ProcessDeal processDeal) {
- return Result.success(processDealService.addProcessDeal(processDeal));
+ return Result.success(processDealService.saveOrUpdate(processDeal));
}
@ApiOperation(value = "鍒犻櫎妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�")
@DeleteMapping("/delProcessDeal")
public Result delProcessDeal(Integer id) {
- return Result.success(processDealService.delProcessDeal(id));
+ return Result.success(processDealService.removeById(id));
}
- @ApiOperation(value = "淇敼妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�")
- @PostMapping("/doProcessDeal")
- public Result doProcessDeal(@RequestBody ProcessDeal processDeal) {
- return Result.success(processDealService.doProcessDeal(processDeal));
- }
@ApiOperation(value = "鏌ョ湅妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�")
@GetMapping("/getProcessDeal")
public Result getProcessDeal(Integer id) {
- return Result.success(processDealService.getById(id));
+ return Result.success(processDealService.list(Wrappers.<ProcessDeal>lambdaQuery().eq(ProcessDeal::getTotaldealId,id)));
}
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessEvaluateController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessEvaluateController.java
index 840c072..a96051b 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessEvaluateController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessEvaluateController.java
@@ -18,7 +18,7 @@
* 娴嬮噺涓嶇‘瀹氬害鐨勮瘎浠� 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-02 01:10:43
*/
@RestController
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessOrderDeviceController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessOrderDeviceController.java
new file mode 100644
index 0000000..0bd5ff2
--- /dev/null
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessOrderDeviceController.java
@@ -0,0 +1,64 @@
+package com.ruoyi.process.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.device.pojo.DeviceRecord;
+import com.ruoyi.device.service.DeviceRecordService;
+import com.ruoyi.process.pojo.ProcessOrderDevice;
+import com.ruoyi.process.service.ProcessOrderDeviceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * <p>
+ * cnas璁惧浣跨敤璁板綍琛�(7.1妫�楠屽鎵樺崟) 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author
+ * @since 2025-04-17 03:51:48
+ */
+@Api(tags = "cnas璁惧浣跨敤璁板綍")
+@RestController
+@RequestMapping("/processOrderDevice")
+public class ProcessOrderDeviceController {
+ @Autowired
+ private ProcessOrderDeviceService processOrderDeviceService;
+
+ @ApiOperation(value = "璁惧浣跨敤璁板綍鏌ヨ")
+ @GetMapping("/deviceRecordPage")
+ public Result deviceRecordPage(Integer deviceId, Page page, String sampleCode, String managementNumber) {
+ return Result.success(processOrderDeviceService.deviceRecordPage(deviceId, page, sampleCode, managementNumber));
+ }
+
+ @ApiOperation(value = "鏂板")
+ @PostMapping("/saveDeviceRecord")
+ public Result saveDeviceRecords(@RequestBody ProcessOrderDevice processOrderDevice) {
+ return Result.success(processOrderDeviceService.save(processOrderDevice));
+ }
+
+ /**
+ * 缂栬緫璁惧浣跨敤璁板綍
+ * @param processOrderDevice
+ * @return
+ */
+ @ApiOperation(value = "淇敼")
+ @PostMapping("/updateDeviceRecord")
+ public Result updateDeviceRecord(@RequestBody ProcessOrderDevice processOrderDevice) {
+ return Result.success(processOrderDeviceService.updateById(processOrderDevice));
+ }
+
+ @DeleteMapping("/deleteDeviceRecord")
+ public Result deleteDeviceRecords(@RequestParam("id") Integer id) {
+ return Result.success(processOrderDeviceService.removeById(id));
+ }
+
+ @ApiOperation(value = "璁惧浣跨敤璁板綍瀵煎嚭")
+ @GetMapping("/exportUseRecord")
+ public void exportUseRecord(Integer deviceId, String exportDate, HttpServletResponse response){
+ //processOrderDeviceService.exportUseRecord(deviceId, exportDate, response);
+ }
+}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java
index fb79222..76a2db2 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java
@@ -10,14 +10,18 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* <p>
* 妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-05 08:58:39
*/
@RestController
@@ -30,7 +34,7 @@
@ApiOperation(value = "鏌ヨ妫�楠屾姤鍛婂彂鏀剧櫥璁板垪琛�")
@GetMapping("/pageProcessReport")
- public Result pageProcessReport(ProcessReport processReport , Page page) throws Exception {
+ public Result pageProcessReport(ProcessReport processReport , Page page) {
return Result.success(processReportService.pageProcessReport(page, processReport));
}
@@ -60,8 +64,11 @@
@ApiOperation(value = "瀵煎嚭妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃")
@GetMapping("/exportProcessReport")
- public Result exportProcessReport(ProcessReportDto processReportDto) {
- return Result.success(processReportService.exportProcessReport(processReportDto.getIds()));
+ public void exportProcessReport(String ids, HttpServletResponse response) {
+ List<Integer> list = Arrays.stream(ids.split(","))
+ .map(Integer::parseInt)
+ .collect(Collectors.toList());
+ processReportService.exportProcessReport(list, response);
}
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessSampleController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessSampleController.java
index 572b43d..53f54a3 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessSampleController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessSampleController.java
@@ -9,6 +9,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
import java.util.Map;
/**
@@ -16,7 +17,7 @@
* 鏍峰搧鎺ユ敹 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-12-12 05:02:49
*/
@RestController
@@ -29,32 +30,27 @@
@ApiOperation(value = "鏌ヨ鏍峰搧鎺ユ敹璇︽儏")
@GetMapping("/pageProcessSample")
- public Result pageProcessSample(ProcessSample processSample, Page page) throws Exception {
+ public Result pageProcessSample(ProcessSample processSample, Page page){
return Result.success(processSampleService.pageProcessSample(page, processSample));
}
@ApiOperation(value = "鏂板鏍峰搧鎺ユ敹璇︽儏")
@PostMapping("/addProcessSample")
public Result addProcessSample(@RequestBody ProcessSample processSample) {
- return Result.success(processSampleService.addProcessSample(processSample));
+ return Result.success(processSampleService.saveOrUpdate(processSample));
}
@ApiOperation(value = "鍒犻櫎鏍峰搧鎺ユ敹")
@DeleteMapping("/delProcessSample")
public Result delProcessSample(Integer id) {
- return Result.success(processSampleService.delProcessSample(id));
+ return Result.success(processSampleService.removeById(id));
}
- @ApiOperation(value = "淇敼鏍峰搧鎺ユ敹")
- @PostMapping("/doProcessSample")
- public Result doProcessSample(@RequestBody ProcessSample processSample) {
- return Result.success(processSampleService.doProcessSample(processSample));
- }
- @ApiOperation(value = "鏌ョ湅鏍峰搧鎺ユ敹")
- @GetMapping("/getProcessSample")
- public Result getProcessSample(Integer id) {
- return Result.success(processSampleService.getById(id));
+ @ApiOperation(value = "瀵煎嚭鏍峰搧鎺ユ敹")
+ @GetMapping("/exportProcessSample")
+ public void exportProcessSample(ProcessSample processSample, HttpServletResponse response) {
+ processSampleService.exportProcessSample(processSample,response);
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotalSampleController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotalSampleController.java
deleted file mode 100644
index cf6b5a0..0000000
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotalSampleController.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.ruoyi.process.controller;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.process.pojo.ProcessTotalSample;
-import com.ruoyi.process.service.ProcessTotalSampleService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Map;
-
-/**
- * <p>
- * 鏍峰搧鎺ユ敹鎬昏〃 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2024-12-12 05:02:58
- */
-@RestController
-@RequestMapping("/processTotalSample")
-@Api(tags = "鏍峰搧鎺ユ敹鎬昏〃")
-public class ProcessTotalSampleController {
-
- @Resource
- private ProcessTotalSampleService processTotalSampleService;
-
- @ApiOperation(value = "鏌ヨ鏍峰搧鎺ユ敹鍒楄〃")
- @GetMapping("/pageProcessTotalSample")
- public Result pageProcessTotalSample(ProcessTotalSample processTotalSample,Page page) throws Exception {
- return Result.success(processTotalSampleService.pageProcessTotalSample(page, processTotalSample));
- }
-
- @ApiOperation(value = "鎻愪氦鏍峰搧鎺ユ敹")
- @PostMapping("/submitProcessTotalSample")
- public Result submitProcessTotalSample(@RequestBody Map<String, Object> param) {
- Integer id = (Integer) param.get("id");
- return Result.success(processTotalSampleService.submitProcessTotalSample(id));
- }
-
- @ApiOperation(value = "瀹℃牳鏍峰搧鎺ユ敹")
- @PostMapping("/checkProcessTotalSample")
- public Result checkProcessTotalSample(@RequestBody Map<String, Object> param) {
- Integer id = (Integer) param.get("id");
- String state = (String) param.get("state");
- return Result.success(processTotalSampleService.checkProcessTotalSample(id, state));
- }
-
- @ApiOperation(value = "鎵瑰噯鏍峰搧鎺ユ敹")
- @PostMapping("/ratifyProcessTotalSample")
- public Result ratifyProcessTotalSample(@RequestBody Map<String, Object> param) {
- Integer id = (Integer) param.get("id");
- String state = (String) param.get("state");
- return Result.success(processTotalSampleService.ratifyProcessTotalSample(id,state));
- }
-
-}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotaldealController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotaldealController.java
index 6d3380d..44f3005 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotaldealController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotaldealController.java
@@ -9,6 +9,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
import java.util.Map;
/**
@@ -16,7 +17,7 @@
* 妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�昏〃(鍘嗗彶) 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-02 03:59:09
*/
@RestController
@@ -31,6 +32,13 @@
@GetMapping("/pageProcessTotaldeal")
public Result pageProcessTotaldeal(ProcessTotaldeal processTotaldeal , Page page) throws Exception {
return Result.success(processTotaldealService.pageProcessTotaldeal(page, processTotaldeal));
+ }
+
+ @ApiOperation(value = "鏂板妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�")
+ @PostMapping("/addProcessTotaldeal")
+ public Result addProcessTotaldeal(@RequestBody Map<String, String> param) {
+ String month = param.get("month");
+ return Result.success(processTotaldealService.addProcessTotaldeal(month));
}
@ApiOperation(value = "鎻愪氦妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�")
@@ -56,5 +64,11 @@
return Result.success(processTotaldealService.ratifyProcessTotaldeal(id,state));
}
+ @ApiOperation(value = "瀵煎嚭妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�")
+ @GetMapping("/exportProcessTotaldeal")
+ public void exportProcessTotaldeal(Integer id, HttpServletResponse response) {
+ processTotaldealService.exportProcessTotaldeal(id,response);
+ }
+
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/mapper/InconsistentDistributionDetailMapper.java b/cnas-process/src/main/java/com/ruoyi/process/mapper/InconsistentDistributionDetailMapper.java
index 8c31339..8156b3a 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/mapper/InconsistentDistributionDetailMapper.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/mapper/InconsistentDistributionDetailMapper.java
@@ -9,7 +9,7 @@
* 涓嶇鍚堥」鐨勫垎甯冭鎯� Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 09:53:33
*/
@Mapper
diff --git a/cnas-process/src/main/java/com/ruoyi/process/mapper/InconsistentDistributionMapper.java b/cnas-process/src/main/java/com/ruoyi/process/mapper/InconsistentDistributionMapper.java
index d2fff19..cfce5b9 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/mapper/InconsistentDistributionMapper.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/mapper/InconsistentDistributionMapper.java
@@ -14,7 +14,7 @@
* 涓嶇鍚堥」鐨勫垎甯� Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 09:53:20
*/
@Mapper
diff --git a/cnas-process/src/main/java/com/ruoyi/process/mapper/InspectionOrderMapper.java b/cnas-process/src/main/java/com/ruoyi/process/mapper/InspectionOrderMapper.java
index 0ab8bb3..96cee33 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/mapper/InspectionOrderMapper.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/mapper/InspectionOrderMapper.java
@@ -9,6 +9,9 @@
import com.ruoyi.process.pojo.InspectionOrder;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+import java.util.Map;
+
/**
* <p>
* 妫�楠屽鎵樺崟 Mapper 鎺ュ彛
@@ -34,4 +37,5 @@
* @return
*/
IPage<InsOrder> getInsOrderOnInspection(Page page, @Param("ew") QueryWrapper<InsOrder> insOrderQueryWrapper);
+
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessComplainMapper.java b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessComplainMapper.java
index 8a025dd..7941190 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessComplainMapper.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessComplainMapper.java
@@ -13,7 +13,7 @@
* 鎶曡瘔 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-02 09:29:11
*/
public interface ProcessComplainMapper extends BaseMapper<ProcessComplain> {
diff --git a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessDealMapper.java b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessDealMapper.java
index 49bfb8b..9af6989 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessDealMapper.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessDealMapper.java
@@ -7,15 +7,20 @@
import com.ruoyi.process.pojo.ProcessDeal;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
/**
* <p>
* 妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃� Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-02 02:50:19
*/
public interface ProcessDealMapper extends BaseMapper<ProcessDeal> {
IPage<ProcessDeal> pageProcessDeal(Page page, @Param("ew") QueryWrapper<ProcessDeal> queryWrappers);
+
+ List<ProcessDeal> selectDeal(@Param("id") Integer id);
+
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessEvaluateMapper.java b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessEvaluateMapper.java
index c3f46ec..85945d1 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessEvaluateMapper.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessEvaluateMapper.java
@@ -12,7 +12,7 @@
* 娴嬮噺涓嶇‘瀹氬害鐨勮瘎浠� Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-02 01:10:43
*/
public interface ProcessEvaluateMapper extends BaseMapper<ProcessEvaluate> {
diff --git a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessOrderDeviceMapper.java b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessOrderDeviceMapper.java
new file mode 100644
index 0000000..80e4b76
--- /dev/null
+++ b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessOrderDeviceMapper.java
@@ -0,0 +1,27 @@
+package com.ruoyi.process.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.process.pojo.ProcessOrderDevice;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * <p>
+ * cnas璁惧浣跨敤璁板綍琛�(7.1妫�楠屽鎵樺崟) Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author
+ * @since 2025-04-17 03:51:48
+ */
+public interface ProcessOrderDeviceMapper extends BaseMapper<ProcessOrderDevice> {
+
+ Set<String> selectDeviceNumber(@Param("inspectionOrderId") Integer inspectionOrderId);
+
+ List<Integer> selectDeviceIdsByNumbers(@Param("orderDeviceNumbers") Set<String> orderDeviceNumbers);
+
+ IPage<ProcessOrderDevice> deviceRecordPage(@Param("deviceId") Integer deviceId, @Param("page") Page page, @Param("sampleCode") String sampleCode, @Param("managementNumber") String managementNumber);
+}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessReportMapper.java b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessReportMapper.java
index f44efbf..56d946b 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessReportMapper.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessReportMapper.java
@@ -14,7 +14,7 @@
* 妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-05 08:58:39
*/
public interface ProcessReportMapper extends BaseMapper<ProcessReport> {
diff --git a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessSampleMapper.java b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessSampleMapper.java
index 417fa05..14accb4 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessSampleMapper.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessSampleMapper.java
@@ -12,7 +12,7 @@
* 鏍峰搧鎺ユ敹 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-12-12 05:02:49
*/
public interface ProcessSampleMapper extends BaseMapper<ProcessSample> {
diff --git a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessTotalSampleMapper.java b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessTotalSampleMapper.java
deleted file mode 100644
index a4786fe..0000000
--- a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessTotalSampleMapper.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.process.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.process.pojo.ProcessTotalSample;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 鏍峰搧鎺ユ敹鎬昏〃 Mapper 鎺ュ彛
- * </p>
- *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2024-12-12 05:02:58
- */
-public interface ProcessTotalSampleMapper extends BaseMapper<ProcessTotalSample> {
-
- IPage<ProcessTotalSample> pageProcessTotalSample(Page page, @Param("ew") QueryWrapper<ProcessTotalSample> ew);
-}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessTotaldealMapper.java b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessTotaldealMapper.java
index ddc0997..12a6189 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessTotaldealMapper.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessTotaldealMapper.java
@@ -12,7 +12,7 @@
* 妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�昏〃(鍘嗗彶) Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-02 03:59:09
*/
public interface ProcessTotaldealMapper extends BaseMapper<ProcessTotaldeal> {
diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/InconsistentDistribution.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/InconsistentDistribution.java
index d0a10e9..25c1930 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/InconsistentDistribution.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/pojo/InconsistentDistribution.java
@@ -12,7 +12,7 @@
* 涓嶇鍚堥」鐨勫垎甯�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 09:53:20
*/
diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/InconsistentDistributionDetail.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/InconsistentDistributionDetail.java
index 40bb846..d87fb60 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/InconsistentDistributionDetail.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/pojo/InconsistentDistributionDetail.java
@@ -13,7 +13,7 @@
* 涓嶇鍚堥」鐨勫垎甯冭鎯�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 09:53:33
*/
@Data
diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessComplain.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessComplain.java
index 0d677e9..66bbf0f 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessComplain.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessComplain.java
@@ -18,7 +18,7 @@
* 鎶曡瘔
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-02 09:29:11
*/
@Getter
diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessDeal.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessDeal.java
index 792f58d..078e04e 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessDeal.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessDeal.java
@@ -16,7 +16,7 @@
* 妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-02 02:50:19
*/
@Getter
@@ -62,4 +62,11 @@
@ApiModelProperty("鍏宠仈鐨勫巻鍙叉�昏〃id")
private Integer totaldealId;
+
+ @ApiModelProperty("鍏宠仈鐨勬牱鍝佹帴鏀秈d")
+ private Integer processSampleId;
+
+ @ApiModelProperty("搴忓彿")
+ @TableField(select = false,exist = false)
+ private String indexs;
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessEvaluate.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessEvaluate.java
index f45d887..ec0e2ec 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessEvaluate.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessEvaluate.java
@@ -18,7 +18,7 @@
* 娴嬮噺涓嶇‘瀹氬害鐨勮瘎浠�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-02 01:10:43
*/
@Getter
diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessOrderDevice.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessOrderDevice.java
new file mode 100644
index 0000000..9d2ae0a
--- /dev/null
+++ b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessOrderDevice.java
@@ -0,0 +1,69 @@
+package com.ruoyi.process.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * cnas璁惧浣跨敤璁板綍琛�(7.1妫�楠屽鎵樺崟)
+ * </p>
+ *
+ * @author
+ * @since 2025-04-17 03:51:48
+ */
+@Getter
+@Setter
+@TableName("cnas_process_order_device")
+@ApiModel(value = "ProcessOrderDevice瀵硅薄", description = "cnas璁惧浣跨敤璁板綍琛�(7.1妫�楠屽鎵樺崟)")
+public class ProcessOrderDevice implements Serializable {
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ private Integer deviceId;
+
+ @ApiModelProperty("濮旀墭鍗昳d")
+ private Integer inspectionOrderId;
+
+ @ApiModelProperty("鏍峰搧缂栧彿")
+ private String sampleCode;
+
+ @ApiModelProperty("浣跨敤鍓�0浠ｈ〃涓嶆甯�1浠ｈ〃姝ｅ父")
+ private Integer useBefore;
+
+ @ApiModelProperty("浣跨敤鍚�0浠ｈ〃涓嶆甯�1浠ｈ〃姝ｅ父")
+ private Integer useAfter;
+
+ @ApiModelProperty("寮傚父鎯呭喌")
+ private String abnormal;
+
+ @ApiModelProperty("浣跨敤寮�濮嬫棩鏈�")
+ private LocalDateTime useStartDate;
+
+ @ApiModelProperty("浣跨敤浜篿d")
+ private Integer usePersonId;
+
+ @ApiModelProperty("浣跨敤浜�")
+ private String usePerson;
+
+ @ApiModelProperty("澶囨敞")
+ private String remark;
+
+ @ApiModelProperty("浣跨敤缁撴潫鏃堕棿")
+ private LocalDateTime useEndDate;
+
+ @ApiModelProperty("璁惧鍚嶇О")
+ @TableField(select = false,exist = false)
+ private String deviceName;
+ @ApiModelProperty("璁惧缂栧彿")
+ @TableField(select = false,exist = false)
+ private String managementNumber;
+}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessReport.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessReport.java
index 9324d5d..4be9719 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessReport.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessReport.java
@@ -17,7 +17,7 @@
* 妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-05 08:58:39
*/
@Getter
@@ -26,6 +26,9 @@
@ApiModel(value = "ProcessReport瀵硅薄", description = "妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃")
public class ProcessReport implements Serializable {
+ @TableField(select = false,exist = false)
+ //瀵煎嚭搴忓彿
+ private Integer indexs;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@@ -79,4 +82,7 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
+
+ @ApiModelProperty("濮旀墭鍗昳d")
+ private Integer inspectionOrderId;
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessSample.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessSample.java
index 4fec589..1865cbb 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessSample.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessSample.java
@@ -19,7 +19,7 @@
* 鏍峰搧鎺ユ敹
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-12-12 05:02:49
*/
@Getter
@@ -59,8 +59,8 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("鍏宠仈鎬昏〃鍘嗗彶id")
- private Integer totalSampleId;
+ @ApiModelProperty("濮旀墭鍗昳d")
+ private Integer inspectionOrderId;
@ApiModelProperty("鏀舵牱鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessTotalSample.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessTotalSample.java
deleted file mode 100644
index ac0c5c8..0000000
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessTotalSample.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.ruoyi.process.pojo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 鏍峰搧鎺ユ敹鎬昏〃
- * </p>
- *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2024-12-12 05:02:58
- */
-@Getter
-@Setter
-@TableName("cnas_process_total_sample")
-@ApiModel(value = "ProcessTotalSample瀵硅薄", description = "鏍峰搧鎺ユ敹鎬昏〃")
-public class ProcessTotalSample implements Serializable {
-
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty("瀹℃牳浜�")
- private Integer examineUser;
-
- @ApiModelProperty("瀹℃牳缁撴灉")
- private String examineState;
-
- @ApiModelProperty("瀹℃牳浜虹數瀛愮鍚島rl")
- private String examineUrl;
-
-
- @TableField(select = false, exist = false)
- private String examineUserName;
-
- @ApiModelProperty("鎵瑰噯浜�")
- private Integer ratifyUser;
-
- @ApiModelProperty("鎵瑰噯缁撴灉")
- private String ratifyState;
-
- @ApiModelProperty("鎵瑰噯浜虹數瀛愮鍚島rl")
- private String ratifyUrl;
-
- @TableField(select = false, exist = false)
- private String ratifyUserName;
-
- @ApiModelProperty("鎻愪氦浜�")
- private Integer submitUser;
- @TableField(select = false, exist = false)
- private String submitUserName;
-
- @ApiModelProperty("鎻愪氦缁撴灉")
- private String submitState;
-
- @ApiModelProperty("鎻愪氦浜虹數瀛愮鍚島rl")
- private String submitUrl;
-
- @ApiModelProperty("鎬绘暟閲�")
- private Integer totalNum;
-
- @ApiModelProperty("鏈堜唤")
- private String month;
-
- @ApiModelProperty("鐢熸垚鐢宠琛ㄧ殑璺緞")
- private String url;
-}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessTotaldeal.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessTotaldeal.java
index ea23a7a..652df41 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessTotaldeal.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessTotaldeal.java
@@ -18,7 +18,7 @@
* 妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�昏〃(鍘嗗彶)
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-02 03:59:09
*/
@Getter
@@ -37,10 +37,6 @@
@ApiModelProperty("瀹℃牳缁撴灉")
private String examineState;
- @ApiModelProperty("瀹℃牳浜虹數瀛愮鍚島rl")
- private String examineUrl;
-
-
@TableField(select = false, exist = false)
private String examineUserName;
@@ -49,9 +45,6 @@
@ApiModelProperty("鎵瑰噯缁撴灉")
private String ratifyState;
-
- @ApiModelProperty("鎵瑰噯浜虹數瀛愮鍚島rl")
- private String ratifyUrl;
@TableField(select = false, exist = false)
private String ratifyUserName;
@@ -64,15 +57,7 @@
@ApiModelProperty("鎻愪氦缁撴灉")
private String submitState;
- @ApiModelProperty("鎻愪氦浜虹數瀛愮鍚島rl")
- private String submitUrl;
-
- @ApiModelProperty("鎬绘暟閲�")
- private Integer totalNum;
-
@ApiModelProperty("鏈堜唤")
private String month;
- @ApiModelProperty("鐢熸垚鐢宠琛ㄧ殑璺緞")
- private String url;
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/schedule/ProcessTotaldealSchedule.java b/cnas-process/src/main/java/com/ruoyi/process/schedule/ProcessTotaldealSchedule.java
deleted file mode 100644
index 50965c7..0000000
--- a/cnas-process/src/main/java/com/ruoyi/process/schedule/ProcessTotaldealSchedule.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.ruoyi.process.schedule;
-
-import com.ruoyi.process.pojo.ProcessTotalSample;
-import com.ruoyi.process.pojo.ProcessTotaldeal;
-import com.ruoyi.process.service.ProcessTotalSampleService;
-import com.ruoyi.process.service.ProcessTotaldealService;
-import org.springframework.beans.BeanUtils;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-
-@Component
-public class ProcessTotaldealSchedule {
-
- @Resource
- private ProcessTotaldealService processTotaldealService;
-
- @Resource
- private ProcessTotalSampleService processTotalSampleService;
-
-// @Scheduled(cron = "0 0 2 1 * ?") //姣忔湀1鍙�2鐐�
- public void processTotaldeal() {
- ProcessTotaldeal processTotaldeal = new ProcessTotaldeal();
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
- Calendar calendar = Calendar.getInstance();
- String formattedDate = sdf.format(calendar.getTime());
- processTotaldeal.setMonth(formattedDate);
- processTotaldeal.setSubmitState("寰呮彁浜�");
- processTotaldealService.save(processTotaldeal);
- ProcessTotalSample processTotalSample = new ProcessTotalSample();
- BeanUtils.copyProperties(processTotaldeal,processTotalSample);
- processTotalSampleService.save(processTotalSample);
- }
-}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/InconsistentDistributionDetailService.java b/cnas-process/src/main/java/com/ruoyi/process/service/InconsistentDistributionDetailService.java
index eb5292c..e48493f 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/InconsistentDistributionDetailService.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/InconsistentDistributionDetailService.java
@@ -8,7 +8,7 @@
* 涓嶇鍚堥」鐨勫垎甯冭鎯� 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 09:53:33
*/
public interface InconsistentDistributionDetailService extends IService<InconsistentDistributionDetail> {
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/InconsistentDistributionService.java b/cnas-process/src/main/java/com/ruoyi/process/service/InconsistentDistributionService.java
index f457c88..30ff8b7 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/InconsistentDistributionService.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/InconsistentDistributionService.java
@@ -14,7 +14,7 @@
* 涓嶇鍚堥」鐨勫垎甯� 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 09:53:20
*/
public interface InconsistentDistributionService extends IService<InconsistentDistribution> {
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessComplainService.java b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessComplainService.java
index 2f05571..fe35d59 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessComplainService.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessComplainService.java
@@ -14,7 +14,7 @@
* 鎶曡瘔 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-02 09:29:11
*/
public interface ProcessComplainService extends IService<ProcessComplain> {
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessDealService.java b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessDealService.java
index 6029ae5..18f18c9 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessDealService.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessDealService.java
@@ -12,16 +12,8 @@
* 妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃� 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-02 02:50:19
*/
public interface ProcessDealService extends IService<ProcessDeal> {
-
- IPage<ProcessDeal> pageProcessDeal(Page page, ProcessDeal processDeal);
-
- int addProcessDeal(ProcessDeal processDeal);
-
- int delProcessDeal(Integer id);
-
- int doProcessDeal(ProcessDeal processDeal);
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessEvaluateService.java b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessEvaluateService.java
index 5d3cc83..1c0dba8 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessEvaluateService.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessEvaluateService.java
@@ -14,7 +14,7 @@
* 娴嬮噺涓嶇‘瀹氬害鐨勮瘎浠� 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-02 01:10:43
*/
public interface ProcessEvaluateService extends IService<ProcessEvaluate> {
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessOrderDeviceService.java b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessOrderDeviceService.java
new file mode 100644
index 0000000..949f455
--- /dev/null
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessOrderDeviceService.java
@@ -0,0 +1,19 @@
+package com.ruoyi.process.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.process.pojo.ProcessOrderDevice;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * cnas璁惧浣跨敤璁板綍琛�(7.1妫�楠屽鎵樺崟) 鏈嶅姟绫�
+ * </p>
+ *
+ * @author
+ * @since 2025-04-17 03:51:48
+ */
+public interface ProcessOrderDeviceService extends IService<ProcessOrderDevice> {
+
+ IPage<ProcessOrderDevice> deviceRecordPage(Integer deviceId, Page page, String sampleCode, String managementNumber);
+}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessReportService.java b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessReportService.java
index 610444e..5ae2987 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessReportService.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessReportService.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.process.pojo.ProcessReport;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
@@ -13,12 +14,12 @@
* 妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-05 08:58:39
*/
public interface ProcessReportService extends IService<ProcessReport> {
IPage<ProcessReport> pageProcessReport(Page page, ProcessReport processReport);
- String exportProcessReport(List<Integer> ids);
+ void exportProcessReport(List<Integer> ids, HttpServletResponse response);
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessSampleService.java b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessSampleService.java
index 5f5d922..ca3f977 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessSampleService.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessSampleService.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.process.pojo.ProcessSample;
+import javax.servlet.http.HttpServletResponse;
import java.util.Map;
/**
@@ -12,16 +13,12 @@
* 鏍峰搧鎺ユ敹 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-12-12 05:02:49
*/
public interface ProcessSampleService extends IService<ProcessSample> {
IPage<ProcessSample> pageProcessSample(Page page, ProcessSample processSample);
- int addProcessSample(ProcessSample processSample);
-
- int delProcessSample(Integer id);
-
- int doProcessSample(ProcessSample processSample);
+ void exportProcessSample(ProcessSample processSample, HttpServletResponse response);
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessTotalSampleService.java b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessTotalSampleService.java
deleted file mode 100644
index af83741..0000000
--- a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessTotalSampleService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.ruoyi.process.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.process.pojo.ProcessTotalSample;
-
-import java.util.Map;
-
-/**
- * <p>
- * 鏍峰搧鎺ユ敹鎬昏〃 鏈嶅姟绫�
- * </p>
- *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2024-12-12 05:02:58
- */
-public interface ProcessTotalSampleService extends IService<ProcessTotalSample> {
-
- IPage<ProcessTotalSample> pageProcessTotalSample(Page page, ProcessTotalSample processTotalSample);
-
- int submitProcessTotalSample(Integer id);
-
- int checkProcessTotalSample(Integer id, String state);
-
- int ratifyProcessTotalSample(Integer id, String state);
-}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessTotaldealService.java b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessTotaldealService.java
index 918e32f..944b577 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessTotaldealService.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessTotaldealService.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.process.pojo.ProcessTotaldeal;
+import javax.servlet.http.HttpServletResponse;
import java.util.Map;
/**
@@ -12,7 +13,7 @@
* 妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�昏〃(鍘嗗彶) 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-02 03:59:09
*/
public interface ProcessTotaldealService extends IService<ProcessTotaldeal> {
@@ -24,4 +25,8 @@
int submitProcessTotaldeal(Integer id);
int ratifyProcessTotaldeal(Integer id, String state);
+
+ int addProcessTotaldeal(String month);
+
+ void exportProcessTotaldeal(Integer id, HttpServletResponse response);
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/InconsistentDistributionDetailServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/InconsistentDistributionDetailServiceImpl.java
index 193165f..5ec8689 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/InconsistentDistributionDetailServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/InconsistentDistributionDetailServiceImpl.java
@@ -11,7 +11,7 @@
* 涓嶇鍚堥」鐨勫垎甯冭鎯� 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 09:53:33
*/
@Service
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/InconsistentDistributionServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/InconsistentDistributionServiceImpl.java
index f108643..b4cbbed 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/InconsistentDistributionServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/InconsistentDistributionServiceImpl.java
@@ -35,7 +35,7 @@
* 涓嶇鍚堥」鐨勫垎甯� 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 09:53:20
*/
@Service
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java
index 526aa38..ae6b0b4 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java
@@ -1,5 +1,8 @@
package com.ruoyi.process.service.impl;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -7,20 +10,24 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
+import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.inspect.pojo.InsOrder;
-import com.ruoyi.inspect.pojo.InsReport;
+import com.ruoyi.inspect.dto.InsOrderDeviceRecordDto;
+import com.ruoyi.inspect.mapper.InsProductResultMapper;
+import com.ruoyi.inspect.mapper.InsSampleMapper;
+import com.ruoyi.inspect.pojo.*;
import com.ruoyi.inspect.service.InsOrderService;
import com.ruoyi.inspect.service.InsReportService;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.process.dto.InspectionOrderDto;
import com.ruoyi.process.dto.InspectionOrderExportDto;
import com.ruoyi.process.mapper.InspectionOrderMapper;
-import com.ruoyi.process.pojo.InspectionOrder;
-import com.ruoyi.process.pojo.InspectionOrderDetail;
-import com.ruoyi.process.service.InspectionOrderDetailService;
-import com.ruoyi.process.service.InspectionOrderService;
+import com.ruoyi.process.mapper.ProcessOrderDeviceMapper;
+import com.ruoyi.process.mapper.ProcessSampleMapper;
+import com.ruoyi.process.pojo.*;
+import com.ruoyi.process.service.*;
+import com.ruoyi.system.mapper.UserMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -37,10 +44,11 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -58,9 +66,27 @@
@Resource
private InsOrderService insOrderService;
@Resource
+ private InsSampleMapper insSampleMapper;
+ @Resource
private InsReportService insReportService;
@Value("${wordUrl}")
private String wordUrl;
+ @Resource
+ private ProcessReportService processReportService;
+ @Resource
+ private ProcessOrderDeviceMapper processOrderDeviceMapper;
+ @Resource
+ private InsProductResultMapper insProductResultMapper;
+ @Resource
+ private ProcessOrderDeviceService processOrderDeviceService;
+ @Resource
+ private UserMapper userMapper;
+ @Resource
+ private ProcessSampleService processSampleService;
+ @Resource
+ private ProcessSampleMapper processSampleMapper;
+ @Resource
+ private ProcessDealService processDealService;
/**
@@ -117,8 +143,88 @@
}
inspectionOrderDetailService.saveBatch(inspectionOrder.getOrderDetailList());
}
-
+ /*鏂板7.8鎶ュ憡缁撴灉*/
+ ProcessReport processReport = new ProcessReport();
+ processReport.setInspectionOrderId(inspectionOrder.getInsOrderId());
+ processReport.setInsReportCode(inspectionOrder.getEntrustCode());//鎶ュ憡缂栧彿=濮旀墭缂栧彿
+ //椤垫暟
+ try {
+ com.aspose.words.Document doc = new com.aspose.words.Document(path);
+ processReport.setPages(doc.getPageCount()+"");
+ } catch (Exception e) {
+ }
+ processReport.setNumber("1");//鍙戦�佷唤鏁伴粯璁�1
+ processReport.setSend(inspectionOrder.getCommissionUnit());//鍙戝線浣曞=濮旀墭鍗曚綅
+ processReport.setMethod(inspectionOrder.getSend()==1?"鑷彇":"鍏朵粬");//鍙戦�佹柟寮�
+ processReport.setSendTime(insReport.getRatifyTime().toLocalDate());//鍙戦�佹棩鏈�
+ processReport.setSendUser(64);//鍙戦�佷汉鍥哄畾
+ processReport.setSignatory(inspectionOrder.getCommissionUser());//绛炬敹浜�=濮旀墭浜�
+ processReportService.save(processReport);
+ /*鏂板7.1濮旀墭鍗曞搴旂殑璁惧浣跨敤璁板綍*/
+ addDeviceRecord(inspectionOrder,insReport.getWriteUserId());
+ /*鏂板7.4鏍峰搧鎺ユ敹*/
+ List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery()
+ .eq(InsSample::getInsOrderId, inspectionOrder.getInsOrderId()));
+ if (insSamples.size()>0){
+ List<ProcessSample> processSamples = new ArrayList<>();
+ for (InsSample insSample : insSamples) {
+ ProcessSample processSample = new ProcessSample();
+ processSample.setReceiveDate(inspectionOrder.getSampleData());//鏀舵牱鏃ユ湡=棰嗘牱鏃ユ湡
+ processSample.setSampleCode(insSample.getSampleCode());//鏍峰搧缂栧彿
+ processSample.setSampleName(insSample.getSample());//鏍峰搧鍚嶇О
+ processSample.setNum(1);//鏍峰搧鏁伴噺=1
+ processSample.setSampleSupplier(inspectionOrder.getCommissionUnit());//鏉ユ牱鍗曚綅
+ LocalDate plusMonths = inspectionOrder.getSampleData() == null ? null : inspectionOrder.getSampleData().plusMonths(1);
+ processSample.setLeaveDate(plusMonths);//鐣欐牱鏃ユ湡=鏀舵牱鏃ユ湡寰�鍚庡欢涓�涓湀
+ processSample.setSampleState(inspectionOrder.getSampleStatus());//鏍峰搧鐘舵��
+ processSample.setDealTime(plusMonths);//閫�鏍锋棩鏈�=鐣欐牱鏃ユ湡
+ processSample.setInspectionOrderId(inspectionOrder.getInspectionOrderId());//濮旀墭鍗昳d
+ processSamples.add(processSample);
+ }
+ processSampleService.saveBatch(processSamples);
+ }
return true;
+ }
+
+ private synchronized void addDeviceRecord(InspectionOrder inspectionOrder,Integer userId) {
+ // 鏌ヨ璁惧浣跨敤璁板綍鏌ヨ璇ヨ鍗曠殑浣跨敤璁板綍
+ Set<String> recordCodeset = processOrderDeviceMapper.selectDeviceNumber(inspectionOrder.getInspectionOrderId());
+ // 鑾峰彇璁㈠崟璁惧缂栧彿
+ List<InsProductResult> resultList = insProductResultMapper.selectResultByOrderId(inspectionOrder.getInsOrderId());
+ Set<String> deviceCodeSet = new HashSet<>();
+ for (InsProductResult result : resultList) {
+ // 娣诲姞璁惧缂栧彿
+ List<JSONObject> jsonObjects = JSON.parseArray(result.getEquipValue(), JSONObject.class);
+ for (JSONObject jsonObject : jsonObjects) {
+ if (!"".equals(jsonObject.get("v") + "")) {
+ List<String> v = StrUtil.split(jsonObject.get("v") + "", "锛�");
+ deviceCodeSet.addAll(v);
+ }
+ }
+ }
+ // 1.鍒ゆ柇鏄惁鏈夋病鏈夋坊鍔犵殑浣跨敤璁板綍
+ Set<String> orderDeviceNumbers = getDeviceDifference(deviceCodeSet, recordCodeset);
+ // 娣诲姞浣跨敤璁板綍, 鏍规嵁缂栧彿鏌ヨ璁惧id
+ if (CollectionUtils.isNotEmpty(orderDeviceNumbers)) {
+ List<Integer> orderDeviceIds = processOrderDeviceMapper.selectDeviceIdsByNumbers(orderDeviceNumbers);
+ List<ProcessOrderDevice> collect = orderDeviceIds.stream().map(deviceId -> {
+ ProcessOrderDevice processOrderDevice = new ProcessOrderDevice();
+ processOrderDevice.setInspectionOrderId(inspectionOrder.getInspectionOrderId());
+ processOrderDevice.setDeviceId(deviceId);
+ processOrderDevice.setSampleCode(inspectionOrder.getEntrustCode());
+ processOrderDevice.setUseBefore(1);
+ processOrderDevice.setUseAfter(1);
+ processOrderDevice.setUsePerson(userMapper.selectById(userId).getName());//浣跨敤浜�
+ processOrderDevice.setUsePersonId(userId);//浣跨敤浜篿d
+ return processOrderDevice;
+ }).collect(Collectors.toList());
+ processOrderDeviceService.saveBatch(collect);
+ }
+ }
+
+ private static Set<String> getDeviceDifference(Set<String> number1, Set<String> number2) {
+ return number1.stream().filter(s1 -> number2.stream().noneMatch(s2 -> s1.equals(s2)))
+ .collect(Collectors.toSet());
}
/**
@@ -140,6 +246,11 @@
}
inspectionOrderDetailService.saveBatch(InspectionOrder.getOrderDetailList());
+ //淇敼7.9鎶ュ憡缁撴灉
+ ProcessReport processReport = processReportService.getOne(Wrappers.<ProcessReport>lambdaQuery().eq(ProcessReport::getInspectionOrderId, InspectionOrder.getInspectionOrderId()));
+ processReport.setInsReportCode(InspectionOrder.getEntrustCode());//鎶ュ憡缂栧彿=濮旀墭缂栧彿
+ processReportService.updateById(processReport);
+
return true;
}
@@ -153,6 +264,23 @@
inspectionOrderDetailService.remove(Wrappers.<InspectionOrderDetail>lambdaQuery()
.eq(InspectionOrderDetail::getInspectionOrderId, inspectionOrderId));
baseMapper.deleteById(inspectionOrderId);
+ //鍒犻櫎7.8鎶ュ憡
+ processReportService.remove(Wrappers.<ProcessReport>lambdaQuery()
+ .eq(ProcessReport::getInspectionOrderId, inspectionOrderId));
+ //鍒犻櫎瀵瑰簲鐨勮澶囦娇鐢ㄨ褰�
+ processOrderDeviceService.remove(Wrappers.<ProcessOrderDevice>lambdaQuery()
+ .eq(ProcessOrderDevice::getInspectionOrderId, inspectionOrderId));
+ //鍒犻櫎瀵瑰簲鐨�7.4鐨勬牱鍝佺敵璇�
+ List<ProcessSample> processSamples = processSampleMapper.selectList(Wrappers.<ProcessSample>lambdaQuery()
+ .eq(ProcessSample::getInspectionOrderId, inspectionOrderId));
+ if (processSamples.size()>0){
+ List<Integer> list = processSamples.stream().map(ProcessSample::getId).collect(Collectors.toList());
+ processDealService.remove(Wrappers.<ProcessDeal>lambdaQuery()
+ .in(ProcessDeal::getProcessSampleId,list));
+ }
+ //鍒犻櫎瀵瑰簲7.4鐨勬牱鍝佹帴鏀�
+ processSampleService.remove(Wrappers.<ProcessSample>lambdaQuery()
+ .eq(ProcessSample::getInspectionOrderId,inspectionOrderId));
return true;
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessComplainServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessComplainServiceImpl.java
index 6b91a0a..0043550 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessComplainServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessComplainServiceImpl.java
@@ -37,7 +37,7 @@
* 鎶曡瘔 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-02 09:29:11
*/
@Service
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java
index b19712c..89dc84b 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java
@@ -26,86 +26,11 @@
* 妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃� 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-02 02:50:19
*/
@Service
@Transactional(rollbackFor = Exception.class)
public class ProcessDealServiceImpl extends ServiceImpl<ProcessDealMapper, ProcessDeal> implements ProcessDealService {
- @Resource
- private ProcessDealMapper processDealMapper;
-
-
- @Autowired
- private UserMapper userMapper;
-
- @Resource
- private ProcessTotaldealMapper processTotaldealMapper;
-
- @Override
- public IPage<ProcessDeal> pageProcessDeal(Page page, ProcessDeal processDeal) {
- Integer userId = SecurityUtils.getUserId().intValue();
- processDeal.setCreateUser(userId);
-
- if (ObjectUtils.isEmpty(processDeal.getTotaldealId())) {
- //鑾峰彇褰撳墠鏈堜唤
- LocalDate currentDate = LocalDate.now();
- // 瀹氫箟鏃ユ湡鏍煎紡
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
- // 鏍煎紡鍖栧綋鍓嶆棩鏈�
- String currentMonth = currentDate.format(formatter);
- //鏌ヨ鍘嗗彶
- ProcessTotaldeal processTotaldeal = processTotaldealMapper.selectOne(Wrappers.<ProcessTotaldeal>lambdaQuery().eq(ProcessTotaldeal::getMonth, currentMonth));
- if(ObjectUtils.isNotEmpty(processTotaldeal)){
- processDeal.setTotaldealId(processTotaldeal.getId());
- }
- }
-
- return processDealMapper.pageProcessDeal(page, QueryWrappers.queryWrappers(processDeal));
- }
-
- @Override
- public int addProcessDeal(ProcessDeal processDeal) {
- ProcessTotaldeal processTotaldeal;
- if (ObjectUtils.isEmpty(processDeal.getTotaldealId())){
- LocalDate dealTime = LocalDate.now();
- // 瀹氫箟鏃ユ湡鏍煎紡
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
- // 鏍煎紡鍖栧綋鍓嶆棩鏈�
- String currentMonth = dealTime.format(formatter);
- processTotaldeal= processTotaldealMapper.selectOne(Wrappers.<ProcessTotaldeal>lambdaQuery().eq(ProcessTotaldeal::getMonth,currentMonth));
- if(ObjectUtils.isNotEmpty(processTotaldeal)){
- processDeal.setTotaldealId(processTotaldeal.getId());
- }
- }else {
- processTotaldeal= processTotaldealMapper.selectById(processDeal.getTotaldealId());
- }
- processDealMapper.insert(processDeal);
- processTotaldeal.setTotalNum(processDeal.getNum()+processTotaldeal.getTotalNum());
- return processTotaldealMapper.updateById(processTotaldeal);
- }
-
- @Override
- public int delProcessDeal(Integer id) {
- ProcessDeal processDeal = processDealMapper.selectById(id);
- processDealMapper.deleteById(id);
- ProcessTotaldeal processTotaldeal = processTotaldealMapper.selectById(processDeal.getTotaldealId());
- processTotaldeal.setTotalNum(processTotaldeal.getTotalNum()-processDeal.getNum());
- return processTotaldealMapper.updateById(processTotaldeal);
- }
-
- @Override
- public int doProcessDeal(ProcessDeal processDeal) {
- if (ObjectUtils.isNotEmpty(processDeal.getNum())) {
- ProcessDeal oldProcessDeal = processDealMapper.selectById(processDeal.getId());
- if(null != processDeal.getTotaldealId()){
- ProcessTotaldeal processTotaldeal = processTotaldealMapper.selectById(processDeal.getTotaldealId());
- int totalNum = ObjectUtils.isEmpty(processTotaldeal) ? 0 : processTotaldeal.getTotalNum();
- processTotaldeal.setTotalNum(totalNum - oldProcessDeal.getNum() + processDeal.getNum());
- processTotaldealMapper.updateById(processTotaldeal);
- }
- }
- return processDealMapper.updateById(processDeal);
- }
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessEvaluateServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessEvaluateServiceImpl.java
index 343a4c6..c7cc2f7 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessEvaluateServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessEvaluateServiceImpl.java
@@ -31,7 +31,7 @@
* 娴嬮噺涓嶇‘瀹氬害鐨勮瘎浠� 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-02 01:10:43
*/
@Service
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessOrderDeviceServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessOrderDeviceServiceImpl.java
new file mode 100644
index 0000000..c92c389
--- /dev/null
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessOrderDeviceServiceImpl.java
@@ -0,0 +1,26 @@
+package com.ruoyi.process.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.process.pojo.ProcessOrderDevice;
+import com.ruoyi.process.mapper.ProcessOrderDeviceMapper;
+import com.ruoyi.process.service.ProcessOrderDeviceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * cnas璁惧浣跨敤璁板綍琛�(7.1妫�楠屽鎵樺崟) 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author
+ * @since 2025-04-17 03:51:48
+ */
+@Service
+public class ProcessOrderDeviceServiceImpl extends ServiceImpl<ProcessOrderDeviceMapper, ProcessOrderDevice> implements ProcessOrderDeviceService {
+
+ @Override
+ public IPage<ProcessOrderDevice> deviceRecordPage(Integer deviceId, Page page, String sampleCode, String managementNumber) {
+ return baseMapper.deviceRecordPage(deviceId, page, sampleCode, managementNumber);
+ }
+}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessReportServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessReportServiceImpl.java
index 7a45959..a92b478 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessReportServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessReportServiceImpl.java
@@ -14,18 +14,22 @@
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
+import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.process.mapper.ProcessReportMapper;
import com.ruoyi.process.pojo.ProcessReport;
import com.ruoyi.process.service.ProcessReportService;
import com.ruoyi.system.mapper.UserMapper;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.poi.xwpf.usermodel.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
import java.io.*;
+import java.net.URLEncoder;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
@@ -39,7 +43,7 @@
* 妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-05 08:58:39
*/
@Service
@@ -74,350 +78,41 @@
}
@Override
- public String exportProcessReport(List<Integer> ids) {
+ public void exportProcessReport(List<Integer> ids, HttpServletResponse response) {
List<ProcessReport> processReports = processReportMapper.getIds(ids);
- for (ProcessReport processReport : processReports) {
- List<String> name = new ArrayList<>();
- for (String s : processReport.getSignatory().split(",")) {
- User user = userMapper.selectById(Integer.parseInt(s));
- name.add(user.getName());
- }
- String signatoryName = name.stream().collect(Collectors.joining(","));
- processReport.setSignatoryName(signatoryName);
- }
- //鐢熸垚妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃
- String url;
- try {
- InputStream inputStream = this.getClass().getResourceAsStream("/static/report-deal.docx");
- File file = File.createTempFile("temp", ".tmp");
- OutputStream outputStream = new FileOutputStream(file);
- IOUtils.copy(inputStream, outputStream);
- url = file.getAbsolutePath();
- } catch (FileNotFoundException e) {
- throw new ErrorException("鎵句笉鍒版ā鏉挎枃浠�");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- ConfigureBuilder builder = Configure.builder();
- builder.useSpringEL(true);
-
- List<Map<String, Object>> reportList = new ArrayList<>();
- Integer index = 1;
- Integer index1 = 1;
- for (int c = 0; c < processReports.size(); c++) {
- //瓒呰繃15琛屾崲椤�
- if (c % 15 == 0) {
- List<RowRenderData> rows = new ArrayList<>();
- //琛ㄦ牸鐨勮鏁�
- for (int i = 0; i < 16; i++) {
- RowRenderData rowRenderData = new RowRenderData();
- RowStyle rowStyle = new RowStyle();
- rowStyle.setHeight(40);
- rowRenderData.setRowStyle(rowStyle);
- List<CellRenderData> cells = new ArrayList<>();
- //琛ㄦ牸鐨勫垪鏁�
- for (int j = 0; j < 10; j++) {
- CellRenderData cellRenderData = new CellRenderData();
- CellStyle cellStyle = new CellStyle();
- cellStyle.setVertAlign(XWPFTableCell.XWPFVertAlign.CENTER);
- cellRenderData.setCellStyle(cellStyle);
- List<ParagraphRenderData> paragraphRenderDataList = new ArrayList<>();
- ParagraphRenderData paragraphRenderData = new ParagraphRenderData();
- ParagraphStyle paragraphStyle = new ParagraphStyle();
- paragraphStyle.setAlign(ParagraphAlignment.CENTER);
- paragraphRenderData.setParagraphStyle(paragraphStyle);
- List<RenderData> renderData = new ArrayList<>();
- TextRenderData textRenderData = new TextRenderData();
- Style style = new Style();
- style.setFontFamily("瀹嬩綋");
- style.setColor("000000");
- textRenderData.setStyle(style);
- if (i == 0) {
- //绗竴琛�
- if (j == 0) {
- //绗竴鍒楀簭鍙�
- textRenderData.setText("搴忓彿@No.");
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else if (j == 1) {
- //绗簩鍒�
- textRenderData.setText("妫�楠屾姤鍛婄紪鍙稝Inspection report number");
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else if (j == 2) {
- //绗笁鍒�
- textRenderData.setText("椤垫暟@Pages");
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else if (j == 3) {
- //绗洓鍒�
- textRenderData.setText("鍙戦�佷唤鏁癅Number of copies sent");
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else if (j == 4) {
- //绗簲鍒�
- textRenderData.setText("鍙戝線浣曞@Where to send to");
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else if (j == 5) {
- //绗叚鍒�
- textRenderData.setText("鍙戦�佹柟寮廆Send method");
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else if (j == 6) {
- //绗竷鍒�
- textRenderData.setText("鍙戦�佹棩鏈烜Date sent");
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- }else if (j == 7) {
- //绗叓鍒�
- textRenderData.setText("鍙戦�佷汉@Sender");
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- }else if (j == 8) {
- //绗節鍒�
- textRenderData.setText("绛炬敹浜篅Signatory");
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- }else{
- //绗崄鍒�
- textRenderData.setText("澶囨敞@Remark");
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- }
- }
- else {
- //鍏朵粬琛�
- if (j == 0) {
- //绗竴鍒�
- try{
- String insReportCode = processReports.get((i-1) + (index1 - 1) * 20).getInsReportCode();
- textRenderData.setText(index + "");
- } catch (Exception e) {
- textRenderData.setText("");
- }
- index++;
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else if (j == 1) {
- try{
- textRenderData.setText(processReports.get((i-1) + (index1 - 1) * 20).getInsReportCode());
- } catch (Exception e) {
- textRenderData.setText("");
- }
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- }
- else if (j == 2) {
- try{
- textRenderData.setText(processReports.get((i-1) + (index1 - 1) * 20).getPages());
- } catch (Exception e) {
- textRenderData.setText("");
- }
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- }
- else if (j == 3) {
- try{
- textRenderData.setText(processReports.get((i-1) + (index1 - 1) * 20).getNumber());
- } catch (Exception e) {
- textRenderData.setText("");
- }
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- }
- else if (j == 4) {
- try{
- textRenderData.setText(processReports.get((i-1) + (index1 - 1) * 20).getSend());
- } catch (Exception e) {
- textRenderData.setText("");
- }
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- }
- else if (j == 5) {
- try{
- textRenderData.setText(processReports.get((i-1) + (index1 - 1) * 20).getMethod());
- } catch (Exception e) {
- textRenderData.setText("");
- }
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- }
- else if (j == 6) {
- try{
- textRenderData.setText(processReports.get((i-1) + (index1 - 1) * 20).getSendTime()+"");
- } catch (Exception e) {
- textRenderData.setText("");
- }
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- }
- else if (j == 7) {
- try{
- textRenderData.setText(processReports.get((i-1) + (index1 - 1) * 20).getSendUserName());
- } catch (Exception e) {
- textRenderData.setText("");
- }
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- }
- else if (j == 8) {
- try{
- textRenderData.setText(processReports.get((i-1) + (index1 - 1) * 20).getSignatoryName());
- } catch (Exception e) {
- textRenderData.setText("");
- }
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- }
- else {
- try{
- textRenderData.setText(processReports.get((i-1) + (index1 - 1) * 20).getRemark());
- } catch (Exception e) {
- textRenderData.setText("");
- }
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- }
- }
- }
- rowRenderData.setCells(cells);
- if (rowRenderData.getCells().size() != 0) {
- rows.add(rowRenderData);
- }
- }
- TableRenderData tableRenderData = new TableRenderData();
- tableRenderData.setRows(rows);
- int countSize = tableRenderData.getRows().get(0).getCells().size();
- for (RowRenderData row : tableRenderData.getRows()) {
- if (row.getCells().size() != countSize) {
- throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑");
- }
- }
- TableStyle tableStyle = new TableStyle();
- tableStyle.setWidth(XWPFTable.DEFAULT_PERCENTAGE_WIDTH);
- tableStyle.setAlign(TableRowAlign.CENTER);
- BorderStyle borderStyle = new BorderStyle();
- borderStyle.setColor("000000");
- borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
- borderStyle.setSize(14);
- tableStyle.setLeftBorder(borderStyle);
- tableStyle.setTopBorder(borderStyle);
- tableStyle.setRightBorder(borderStyle);
- tableStyle.setBottomBorder(borderStyle);
- tableRenderData.setTableStyle(tableStyle);
- Map<String, Object> table = new HashMap<>();
- table.put("report", tableRenderData);
- table.put("index1", index1);
- reportList.add(table);
- index1++;
- }
- }
- Integer finalIndex = index1;
- XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
+// for (ProcessReport record : processReports) {
+// List<String> name = new ArrayList<>();
+// if(StringUtils.isNotBlank(record.getSignatory())){
+// for (String s : record.getSignatory().split(",")) {
+// User user = userMapper.selectById(Integer.parseInt(s));
+// name.add(user.getName());
+// }
+// String signatoryName = name.stream().collect(Collectors.joining(","));
+// record.setSignatoryName(signatoryName);
+// }
+// }
+ // 鑾峰彇璺緞
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/report-deal.docx");
+ Configure configure = Configure.builder()
+ .bind("reportList", new HackLoopTableRenderPolicy())
+ .build();
+ XWPFTemplate template = XWPFTemplate.compile(inputStream, configure).render(
new HashMap<String, Object>() {{
- put("reportList", reportList);
+ put("reportList", processReports);
}});
- String name = UUID.randomUUID() + "_妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃" + ".docx";
try {
- template.writeAndClose(Files.newOutputStream(Paths.get(wordUrl + "/" + name)));
- } catch (IOException e) {
- throw new RuntimeException(e);
+ response.setContentType("application/msword");
+ String fileName = URLEncoder.encode(
+ "妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃", "UTF-8");
+ response.setHeader("Content-disposition",
+ "attachment;filename=" + fileName + ".docx");
+ OutputStream os = response.getOutputStream();
+ template.write(os);
+ os.flush();
+ os.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException("瀵煎嚭澶辫触");
}
- //澶勭悊涓嫳鏂囨崲琛岀殑闂
- String path = wordUrl + "/" + name;
- try {
- FileInputStream stream1 = new FileInputStream(path);
- XWPFDocument document1 = new XWPFDocument(stream1);
- List<XWPFTable> xwpfTables1 = document1.getTables();
- for (int i = 0; i < xwpfTables1.size(); i++) {
- for (int j = 0; j < xwpfTables1.get(i).getRows().size(); j++) {
- for (int k = 0; k < xwpfTables1.get(i).getRows().get(j).getTableCells().size(); k++) {
- if (xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getText().contains("@")) {
- String text = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getText();
- String[] split = text.split("@");
- xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).removeParagraph(0);
- XWPFParagraph xwpfParagraph = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).addParagraph();
- XWPFRun run = xwpfParagraph.createRun();
- run.setText(split[0]);
- if (ObjectUtils.isNotNull(split[1])) {
- run.addBreak();
- run.setText(split[1]);
- }
- xwpfParagraph.setAlignment(ParagraphAlignment.CENTER);
- }
- }
- }
- }
- FileOutputStream fileOutputStream1 = new FileOutputStream(path);
- document1.write(fileOutputStream1);
- fileOutputStream1.close();
- } catch (FileNotFoundException e) {
- throw new RuntimeException(e);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- return name;
}
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessSampleServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessSampleServiceImpl.java
index e351b93..f4dd8a7 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessSampleServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessSampleServiceImpl.java
@@ -1,28 +1,32 @@
package com.ruoyi.process.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.deepoove.poi.XWPFTemplate;
+import com.deepoove.poi.config.Configure;
+import com.deepoove.poi.data.FilePictureRenderData;
import com.ruoyi.common.utils.QueryWrappers;
+import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.process.mapper.ProcessSampleMapper;
-import com.ruoyi.process.mapper.ProcessTotalSampleMapper;
import com.ruoyi.process.pojo.ProcessSample;
-import com.ruoyi.process.pojo.ProcessTotalSample;
import com.ruoyi.process.service.ProcessSampleService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.List;
/**
* <p>
* 鏍峰搧鎺ユ敹 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-12-12 05:02:49
*/
@Service
@@ -31,64 +35,35 @@
@Resource
private ProcessSampleMapper processSampleMapper;
- @Resource
- private ProcessTotalSampleMapper processTotalSampleMapper;
-
-
-
@Override
public IPage<ProcessSample> pageProcessSample(Page page, ProcessSample processSample) {
- //todo锛氫粎鐪嬫垜
- if (ObjectUtils.isEmpty(processSample.getTotalSampleId())) {
- //鑾峰彇褰撳墠鏈堜唤
- LocalDate currentDate = LocalDate.now();
- // 瀹氫箟鏃ユ湡鏍煎紡
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
- // 鏍煎紡鍖栧綋鍓嶆棩鏈�
- String currentMonth = currentDate.format(formatter);
- //鏌ヨ鍘嗗彶
- ProcessTotalSample processTotalSample = processTotalSampleMapper.selectOne(Wrappers.<ProcessTotalSample>lambdaQuery().eq(ProcessTotalSample::getMonth, currentMonth));
- processSample.setTotalSampleId(processTotalSample.getId());
- }
return processSampleMapper.pageProcessSample(page, QueryWrappers.queryWrappers(processSample));
}
@Override
- public int addProcessSample(ProcessSample processSample) {
- ProcessTotalSample processTotalSample;
- if (ObjectUtils.isEmpty(processSample.getTotalSampleId())){
- LocalDate dealTime = LocalDate.now();
- // 瀹氫箟鏃ユ湡鏍煎紡
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
- // 鏍煎紡鍖栧綋鍓嶆棩鏈�
- String currentMonth = dealTime.format(formatter);
- processTotalSample= processTotalSampleMapper.selectOne(Wrappers.<ProcessTotalSample>lambdaQuery().eq(ProcessTotalSample::getMonth,currentMonth));
- processSample.setTotalSampleId(processTotalSample.getId());
- }else {
- processTotalSample= processTotalSampleMapper.selectById(processSample.getTotalSampleId());
+ public void exportProcessSample(ProcessSample processSample, HttpServletResponse response) {
+ List<ProcessSample> processSampleList = pageProcessSample(new Page(-1, -1), processSample).getRecords();
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/sample-receive.docx");
+ Configure configure = Configure.builder()
+ .bind("sampleList", new HackLoopTableRenderPolicy())
+ .build();
+ XWPFTemplate template = XWPFTemplate.compile(inputStream, configure).render(
+ new HashMap<String, Object>() {{
+ put("sampleList", processSampleList);
+ }});
+ try {
+ response.setContentType("application/msword");
+ String fileName = URLEncoder.encode(
+ "妫�楠屾牱鍝佺櫥璁拌〃", "UTF-8");
+ response.setHeader("Content-disposition",
+ "attachment;filename=" + fileName + ".docx");
+ OutputStream os = response.getOutputStream();
+ template.write(os);
+ os.flush();
+ os.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException("瀵煎嚭澶辫触");
}
- processSampleMapper.insert(processSample);
- processTotalSample.setTotalNum(processSample.getNum()+processTotalSample.getTotalNum());
- return processTotalSampleMapper.updateById(processTotalSample);
- }
-
- @Override
- public int delProcessSample(Integer id) {
- ProcessSample processSample = processSampleMapper.selectById(id);
- processSampleMapper.deleteById(id);
- ProcessTotalSample processTotalSample = processTotalSampleMapper.selectById(processSample.getTotalSampleId());
- processTotalSample.setTotalNum(processTotalSample.getTotalNum()-processSample.getNum());
- return processTotalSampleMapper.updateById(processTotalSample);
- }
-
- @Override
- public int doProcessSample(ProcessSample processSample) {
- if (ObjectUtils.isNotEmpty(processSample.getNum())) {
- ProcessSample oldProcessSample = processSampleMapper.selectById(processSample.getId());
- ProcessTotalSample processTotalSample = processTotalSampleMapper.selectById(processSample.getTotalSampleId());
- processTotalSample.setTotalNum(processTotalSample.getTotalNum() - oldProcessSample.getNum() + processSample.getNum());
- processTotalSampleMapper.updateById(processTotalSample);
- }
- return processSampleMapper.updateById(processSample);
}
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotalSampleServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotalSampleServiceImpl.java
deleted file mode 100644
index c7e19dc..0000000
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotalSampleServiceImpl.java
+++ /dev/null
@@ -1,437 +0,0 @@
-package com.ruoyi.process.service.impl;
-
-import cn.hutool.core.lang.UUID;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.deepoove.poi.XWPFTemplate;
-import com.deepoove.poi.config.Configure;
-import com.deepoove.poi.config.ConfigureBuilder;
-import com.deepoove.poi.data.*;
-import com.deepoove.poi.data.style.*;
-import com.ruoyi.common.core.domain.entity.User;
-import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.process.mapper.ProcessSampleMapper;
-import com.ruoyi.process.mapper.ProcessTotalSampleMapper;
-import com.ruoyi.process.pojo.ProcessSample;
-import com.ruoyi.process.pojo.ProcessTotalSample;
-import com.ruoyi.process.service.ProcessTotalSampleService;
-import com.ruoyi.system.mapper.UserMapper;
-import org.apache.commons.io.IOUtils;
-import org.apache.poi.xwpf.usermodel.*;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.*;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 鏍峰搧鎺ユ敹鎬昏〃 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2024-12-12 05:02:58
- */
-@Service
-public class ProcessTotalSampleServiceImpl extends ServiceImpl<ProcessTotalSampleMapper, ProcessTotalSample> implements ProcessTotalSampleService {
-
- @Value("${wordUrl}")
- private String wordUrl;
-
- @Value("${file.path}")
- private String imgUrl;
-
-
- @Resource
- private UserMapper userMapper;
-
- @Resource
- private ProcessTotalSampleMapper processTotalSampleMapper;
-
- @Resource
- private ProcessSampleMapper processSampleMapper;
-
- @Override
- public IPage<ProcessTotalSample> pageProcessTotalSample(Page page, ProcessTotalSample processTotalSample) {
-
- return processTotalSampleMapper.pageProcessTotalSample(page, QueryWrappers.queryWrappers(processTotalSample));
- }
-
- @Override
- public int submitProcessTotalSample(Integer id) {
- Integer userId = SecurityUtils.getUserId().intValue();
- User user = userMapper.selectById(userId);
- if (ObjectUtils.isEmpty(user.getSignatureUrl())) throw new ErrorException("鏈壘鍒板～琛ㄤ汉鐨勭數瀛愮鍚�,璇蜂笂浼犺嚜宸辩殑鐢靛瓙绛惧悕!");
- ProcessTotalSample processTotalSample = processTotalSampleMapper.selectById(id);
- processTotalSample.setSubmitUser(userId);
- processTotalSample.setSubmitState("宸叉彁浜�");
- processTotalSample.setSubmitUrl(user.getSignatureUrl());
- //鐢熸垚鏍峰搧澶勭悊鐢宠琛ㄥ苟灏嗗～琛ㄤ汉鐨勭數瀛愮鍚嶅嵃涓�
- processTotalSample.setUrl(processTotalSample(id,user.getSignatureUrl()));
- return processTotalSampleMapper.updateById(processTotalSample);
- }
-
- @Override
- public int checkProcessTotalSample(Integer id, String state) {
- Integer userId = SecurityUtils.getUserId().intValue();
- User user = userMapper.selectById(userId);
- if (ObjectUtils.isEmpty(user.getSignatureUrl())) throw new ErrorException("鏈壘鍒板鏍镐汉鐨勭數瀛愮鍚�,璇蜂笂浼犺嚜宸辩殑鐢靛瓙绛惧悕!");
- ProcessTotalSample processTotalSample = processTotalSampleMapper.selectById(id);
- processTotalSample.setExamineUser(userId);
- processTotalSample.setExamineState(state);
- processTotalSample.setExamineUrl(user.getSignatureUrl());
- if (state.equals("涓嶉�氳繃")) {
- processTotalSample.setSubmitState("寰呮彁浜�");
- }
- //灏嗗鏍镐汉鐨勭數瀛愮鍚嶅嵃涓�
- wordInsertUrl(new HashMap<String, Object>() {{
- put("examineUrl", new FilePictureRenderData(100,50,imgUrl + "/" + user.getSignatureUrl()));
- }}, wordUrl+"/"+processTotalSample.getUrl());
- return processTotalSampleMapper.updateById(processTotalSample);
- }
-
- @Override
- public int ratifyProcessTotalSample(Integer id, String state) {
- Integer userId = SecurityUtils.getUserId().intValue();
- User user = userMapper.selectById(userId);
- if (ObjectUtils.isEmpty(user.getSignatureUrl())) throw new ErrorException("鏈壘鍒版壒鍑嗕汉鐨勭數瀛愮鍚�,璇蜂笂浼犺嚜宸辩殑鐢靛瓙绛惧悕!");
- ProcessTotalSample processTotalSample = processTotalSampleMapper.selectById(id);
- processTotalSample.setRatifyUser(userId);
- processTotalSample.setRatifyState(state);
- processTotalSample.setRatifyUrl(user.getSignatureUrl());
- if (state.equals("涓嶉�氳繃")) {
- processTotalSample.setSubmitState("寰呮彁浜�");
- }
- //灏嗘壒鍑嗕汉鐨勭鍚嶅嵃涓�
- wordInsertUrl(new HashMap<String, Object>() {{
- put("ratifyUrl", new FilePictureRenderData(100,50,imgUrl + "/" + user.getSignatureUrl()));
- }}, wordUrl+"/"+processTotalSample.getUrl());
- return processTotalSampleMapper.updateById(processTotalSample);
- }
-
- //鐢熸垚鏍峰搧澶勭悊琛╳ord
- private String processTotalSample(Integer id,String signatureUrl){
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�");
- List<ProcessSample> processSamples = processSampleMapper.selectList(Wrappers.<ProcessSample>lambdaQuery().eq(ProcessSample::getTotalSampleId,id));
- String url;
- try {
- InputStream inputStream = this.getClass().getResourceAsStream("/static/sample-receive.docx");
- File file = File.createTempFile("temp", ".tmp");
- OutputStream outputStream = new FileOutputStream(file);
- IOUtils.copy(inputStream, outputStream);
- url = file.getAbsolutePath();
- } catch (FileNotFoundException e) {
- throw new ErrorException("鎵句笉鍒版ā鏉挎枃浠�");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- ConfigureBuilder builder = Configure.builder();
- builder.useSpringEL(true);
-
- List<Map<String, Object>> sampleList = new ArrayList<>();
- Integer index = 1;
- Integer index1 = 1;
- for (int c = 0; c < processSamples.size(); c++) {
- //瓒呰繃20琛屾崲椤�
- if (c % 20 == 0) {
- List<RowRenderData> rows = new ArrayList<>();
- //琛ㄦ牸鐨勮鏁�
- for (int i = 0; i < 21; i++) {
- RowRenderData rowRenderData = new RowRenderData();
- RowStyle rowStyle = new RowStyle();
- rowStyle.setHeight(40);
- rowRenderData.setRowStyle(rowStyle);
- List<CellRenderData> cells = new ArrayList<>();
- //琛ㄦ牸鐨勫垪鏁�
- for (int j = 0; j < 8; j++) {
- CellRenderData cellRenderData = new CellRenderData();
- CellStyle cellStyle = new CellStyle();
- cellStyle.setVertAlign(XWPFTableCell.XWPFVertAlign.CENTER);
- cellRenderData.setCellStyle(cellStyle);
- List<ParagraphRenderData> paragraphRenderDataList = new ArrayList<>();
- ParagraphRenderData paragraphRenderData = new ParagraphRenderData();
- ParagraphStyle paragraphStyle = new ParagraphStyle();
- paragraphStyle.setAlign(ParagraphAlignment.CENTER);
- paragraphRenderData.setParagraphStyle(paragraphStyle);
- List<RenderData> renderData = new ArrayList<>();
- TextRenderData textRenderData = new TextRenderData();
- Style style = new Style();
- style.setFontFamily("瀹嬩綋");
- style.setColor("000000");
- textRenderData.setStyle(style);
- if (i == 0) {
- //绗竴琛�
- if (j == 0) {
- //绗竴鍒楀簭鍙�
- textRenderData.setText("鏀舵牱鏃ユ湡@Date of receipt");
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else if (j == 1) {
- //绗簩鍒楁牱鍝佸悕绉�
- textRenderData.setText("鏍峰搧缂栧彿@Sample number");
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else if (j == 2) {
- //绗笁鍒楁牱鍝佺紪鍙�
- textRenderData.setText("鏍峰搧鍚嶇О@Sample name");
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else if (j == 3) {
- //绗洓鍒椾緵鏍峰崟浣�
- textRenderData.setText("鏍峰搧鏁伴噺@Number of samples");
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else if (j == 4) {
- //绗簲鍒楁暟閲�
- textRenderData.setText("鏉ユ牱鍗曚綅@Sample unit");
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else if (j == 5) {
- //绗叚鍒楀鐞嗘柟寮�
- textRenderData.setText("鐣欐牱鏃ユ湡@Sample retention date");
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else if (j == 6) {
- //绗叚鍒楀鐞嗘柟寮�
- textRenderData.setText("鏍峰搧鐘舵�丂Sample status");
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- }
- else {
- //绗竷鍒楁椂闂�
- textRenderData.setText("閫�鏍风鏀跺拰/鎴栧鐞嗘棩鏈烜Return signature and/or processing date");
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- }
- }
- else {
- //鍏朵粬琛�
- if (j == 0) {
- //绗竴鍒�
- try{
- String receiveDate = processSamples.get((i-1) + (index1 - 1) * 20).getReceiveDate().format(formatter);
- textRenderData.setText(receiveDate);
- } catch (Exception e) {
- textRenderData.setText("");
- }
- index++;
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else if (j == 1) {
- try{
- textRenderData.setText(processSamples.get((i-1) + (index1 - 1) * 20).getSampleCode());
- } catch (Exception e) {
- textRenderData.setText("");
- }
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- }
- else if (j == 2) {
- try{
- textRenderData.setText(processSamples.get((i-1) + (index1 - 1) * 20).getSampleName());
- } catch (Exception e) {
- textRenderData.setText("");
- }
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- }
- else if (j == 3) {
- try{
- textRenderData.setText(processSamples.get((i-1) + (index1 - 1) * 20).getNum()+"");
- } catch (Exception e) {
- textRenderData.setText("");
- }
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- }
- else if (j == 4) {
- try{
- textRenderData.setText(processSamples.get((i-1) + (index1 - 1) * 20).getSampleSupplier());
- } catch (Exception e) {
- textRenderData.setText("");
- }
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- }
- else if (j == 5) {
- try{
- textRenderData.setText(processSamples.get((i-1) + (index1 - 1) * 20).getLeaveDate().format(formatter));
- } catch (Exception e) {
- textRenderData.setText("");
- }
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- }
- else if (j == 5) {
- try{
- textRenderData.setText(processSamples.get((i-1) + (index1 - 1) * 20).getSampleState());
- } catch (Exception e) {
- textRenderData.setText("");
- }
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- }
- else {
- try{
- textRenderData.setText(processSamples.get((i-1) + (index1 - 1) * 20).getDealTime().format(formatter));
- } catch (Exception e) {
- textRenderData.setText("");
- }
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- }
- }
- }
- rowRenderData.setCells(cells);
- if (rowRenderData.getCells().size() != 0) {
- rows.add(rowRenderData);
- }
- }
- TableRenderData tableRenderData = new TableRenderData();
- tableRenderData.setRows(rows);
- int countSize = tableRenderData.getRows().get(0).getCells().size();
- for (RowRenderData row : tableRenderData.getRows()) {
- if (row.getCells().size() != countSize) {
- throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑");
- }
- }
- TableStyle tableStyle = new TableStyle();
- tableStyle.setWidth(XWPFTable.DEFAULT_PERCENTAGE_WIDTH);
- tableStyle.setAlign(TableRowAlign.CENTER);
- BorderStyle borderStyle = new BorderStyle();
- borderStyle.setColor("000000");
- borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
- borderStyle.setSize(14);
- tableStyle.setLeftBorder(borderStyle);
- tableStyle.setTopBorder(borderStyle);
- tableStyle.setRightBorder(borderStyle);
- tableStyle.setBottomBorder(borderStyle);
- tableRenderData.setTableStyle(tableStyle);
- Map<String, Object> table = new HashMap<>();
- table.put("sample", tableRenderData);
- table.put("index1", index1);
- sampleList.add(table);
- index1++;
- }
- }
- Integer finalIndex = index1;
- XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
- new HashMap<String, Object>() {{
- put("sampleList", sampleList);
- put("size", finalIndex);
- put("examineUrl", null);
- put("ratifyUrl", null);
- put("writeUrl", new FilePictureRenderData(100,50,imgUrl + "/" + signatureUrl));
- }});
- String name = UUID.randomUUID() + "_妫�楠屾牱鍝佺櫥璁拌〃" + ".docx";
- try {
- template.writeAndClose(Files.newOutputStream(Paths.get(wordUrl + "/" + name)));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- //澶勭悊涓嫳鏂囨崲琛岀殑闂
- String path = wordUrl + "/" + name;
- try {
- FileInputStream stream1 = new FileInputStream(path);
- XWPFDocument document1 = new XWPFDocument(stream1);
- List<XWPFTable> xwpfTables1 = document1.getTables();
- for (int i = 0; i < xwpfTables1.size(); i++) {
- for (int j = 0; j < xwpfTables1.get(i).getRows().size(); j++) {
- for (int k = 0; k < xwpfTables1.get(i).getRows().get(j).getTableCells().size(); k++) {
- if (xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getText().contains("@")) {
- String text = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getText();
- String[] split = text.split("@");
- xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).removeParagraph(0);
- XWPFParagraph xwpfParagraph = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).addParagraph();
- XWPFRun run = xwpfParagraph.createRun();
- run.setText(split[0]);
- if (ObjectUtils.isNotNull(split[1])) {
- run.addBreak();
- run.setText(split[1]);
- }
- xwpfParagraph.setAlignment(ParagraphAlignment.CENTER);
- }
- }
- }
- }
- FileOutputStream fileOutputStream1 = new FileOutputStream(path);
- document1.write(fileOutputStream1);
- fileOutputStream1.close();
- } catch (FileNotFoundException e) {
- throw new RuntimeException(e);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- return name;
- }
-
- public int wordInsertUrl(Map<String, Object> map, String url) {
- XWPFTemplate template = XWPFTemplate.compile(url).render(map);
- try {
- template.writeAndClose(Files.newOutputStream(Paths.get(url)));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- return 1;
- }
-}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java
index 880e4f6..7e7bad5 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java
@@ -15,22 +15,36 @@
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
+import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.inspect.util.UserUtils;
+import com.ruoyi.process.mapper.InspectionOrderMapper;
import com.ruoyi.process.mapper.ProcessDealMapper;
+import com.ruoyi.process.mapper.ProcessSampleMapper;
import com.ruoyi.process.mapper.ProcessTotaldealMapper;
+import com.ruoyi.process.pojo.InspectionOrder;
import com.ruoyi.process.pojo.ProcessDeal;
+import com.ruoyi.process.pojo.ProcessSample;
import com.ruoyi.process.pojo.ProcessTotaldeal;
+import com.ruoyi.process.service.ProcessDealService;
import com.ruoyi.process.service.ProcessTotaldealService;
import com.ruoyi.system.mapper.UserMapper;
import org.apache.commons.io.IOUtils;
import org.apache.poi.xwpf.usermodel.*;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.soap.SAAJMetaFactory;
import java.io.*;
+import java.net.URLEncoder;
import java.nio.file.Files;
import java.nio.file.Paths;
+import java.time.LocalDate;
+import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -41,7 +55,7 @@
* 妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�昏〃(鍘嗗彶) 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-02 03:59:09
*/
@Service
@@ -52,10 +66,16 @@
private ProcessTotaldealMapper processTotaldealMapper;
@Resource
- private ProcessDealMapper processDealMapper;
+ private ProcessSampleMapper processSampleMapper;
- @Value("${wordUrl}")
- private String wordUrl;
+ @Resource
+ private ProcessDealService processDealService;
+
+ @Resource
+ private InspectionOrderMapper inspectionOrderMapper;
+
+ @Resource
+ private ProcessDealMapper processDealMapper;
@Value("${file.path}")
private String imgUrl;
@@ -80,9 +100,6 @@
ProcessTotaldeal processTotaldeal = processTotaldealMapper.selectById(id);
processTotaldeal.setSubmitUser(userId);
processTotaldeal.setSubmitState("宸叉彁浜�");
- processTotaldeal.setSubmitUrl(user.getSignatureUrl());
- //鐢熸垚鏍峰搧澶勭悊鐢宠琛ㄥ苟灏嗗～琛ㄤ汉鐨勭數瀛愮鍚嶅嵃涓�
- processTotaldeal.setUrl(processTotaldeal(id, user.getSignatureUrl()));
return processTotaldealMapper.updateById(processTotaldeal);
}
@@ -96,14 +113,9 @@
ProcessTotaldeal processTotaldeal = processTotaldealMapper.selectById(id);
processTotaldeal.setExamineUser(userId);
processTotaldeal.setExamineState(state);
- processTotaldeal.setExamineUrl(user.getSignatureUrl());
if (state.equals("涓嶉�氳繃")) {
processTotaldeal.setSubmitState("寰呮彁浜�");
}
- //灏嗗鏍镐汉鐨勭數瀛愮鍚嶅嵃涓�
- wordInsertUrl(new HashMap<String, Object>() {{
- put("examineUrl", new FilePictureRenderData(100, 50, imgUrl + "/" + user.getSignatureUrl()));
- }}, wordUrl + "/" + processTotaldeal.getUrl());
return processTotaldealMapper.updateById(processTotaldeal);
}
@@ -117,300 +129,90 @@
ProcessTotaldeal processTotaldeal = processTotaldealMapper.selectById(id);
processTotaldeal.setRatifyUser(userId);
processTotaldeal.setRatifyState(state);
- processTotaldeal.setRatifyUrl(user.getSignatureUrl());
if (state.equals("涓嶉�氳繃")) {
+ processTotaldeal.setExamineState(state);
processTotaldeal.setSubmitState("寰呮彁浜�");
}
- //灏嗘壒鍑嗕汉鐨勭鍚嶅嵃涓�
- wordInsertUrl(new HashMap<String, Object>() {{
- put("ratifyUrl", new FilePictureRenderData(100, 50, imgUrl + "/" + user.getSignatureUrl()));
- }}, wordUrl + "/" + processTotaldeal.getUrl());
return processTotaldealMapper.updateById(processTotaldeal);
}
- //鐢熸垚鏍峰搧澶勭悊琛╳ord
- private String processTotaldeal(Integer id, String signatureUrl) {
- List<ProcessDeal> processDeals = processDealMapper.selectList(Wrappers.<ProcessDeal>lambdaQuery().eq(ProcessDeal::getTotaldealId, id));
- String url;
- try {
- InputStream inputStream = this.getClass().getResourceAsStream("/static/sample-deal.docx");
- File file = File.createTempFile("temp", ".tmp");
- OutputStream outputStream = new FileOutputStream(file);
- IOUtils.copy(inputStream, outputStream);
- url = file.getAbsolutePath();
- } catch (FileNotFoundException e) {
- throw new ErrorException("鎵句笉鍒版ā鏉挎枃浠�");
- } catch (IOException e) {
- throw new RuntimeException(e);
+ @Override
+ public int addProcessTotaldeal(String month) {
+ //鏂板鎬昏〃
+ ProcessTotaldeal processTotaldeal = new ProcessTotaldeal();
+ List<ProcessTotaldeal> processTotaldeals = processTotaldealMapper.selectList(Wrappers.<ProcessTotaldeal>lambdaQuery()
+ .eq(ProcessTotaldeal::getMonth, month));
+ if (processTotaldeals.size()<=0) {
+ processTotaldeal.setMonth(month);//鏈堜唤
+ processTotaldeal.setSubmitState("寰呮彁浜�");
+ processTotaldealMapper.insert(processTotaldeal);
+ }else {
+ processTotaldeal=processTotaldeals.get(0);
}
- ConfigureBuilder builder = Configure.builder();
- builder.useSpringEL(true);
-
- List<Map<String, Object>> sampleList = new ArrayList<>();
- Integer index = 1;
- Integer index1 = 1;
- for (int c = 0; c < processDeals.size(); c++) {
- //瓒呰繃20琛屾崲椤�
- if (c % 20 == 0) {
- List<RowRenderData> rows = new ArrayList<>();
- //琛ㄦ牸鐨勮鏁�
- for (int i = 0; i < 21; i++) {
- RowRenderData rowRenderData = new RowRenderData();
- RowStyle rowStyle = new RowStyle();
- rowStyle.setHeight(40);
- rowRenderData.setRowStyle(rowStyle);
- List<CellRenderData> cells = new ArrayList<>();
- //琛ㄦ牸鐨勫垪鏁�
- for (int j = 0; j < 7; j++) {
- CellRenderData cellRenderData = new CellRenderData();
- CellStyle cellStyle = new CellStyle();
- cellStyle.setVertAlign(XWPFTableCell.XWPFVertAlign.CENTER);
- cellRenderData.setCellStyle(cellStyle);
- List<ParagraphRenderData> paragraphRenderDataList = new ArrayList<>();
- ParagraphRenderData paragraphRenderData = new ParagraphRenderData();
- ParagraphStyle paragraphStyle = new ParagraphStyle();
- paragraphStyle.setAlign(ParagraphAlignment.CENTER);
- paragraphRenderData.setParagraphStyle(paragraphStyle);
- List<RenderData> renderData = new ArrayList<>();
- TextRenderData textRenderData = new TextRenderData();
- Style style = new Style();
- style.setFontFamily("瀹嬩綋");
- style.setColor("000000");
- textRenderData.setStyle(style);
- if (i == 0) {
- //绗竴琛�
- if (j == 0) {
- //绗竴鍒楀簭鍙�
- textRenderData.setText("搴忓彿@No.");
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else if (j == 1) {
- //绗簩鍒楁牱鍝佸悕绉�
- textRenderData.setText("鏍峰搧鍚嶇О@Sample name");
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else if (j == 2) {
- //绗笁鍒楁牱鍝佺紪鍙�
- textRenderData.setText("鏍峰搧缂栧彿@Sample number");
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else if (j == 3) {
- //绗洓鍒椾緵鏍峰崟浣�
- textRenderData.setText("渚涙牱鍗曚綅@Sample unit");
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else if (j == 4) {
- //绗簲鍒楁暟閲�
- textRenderData.setText("鏁伴噺@Quantity");
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else if (j == 5) {
- //绗叚鍒楀鐞嗘柟寮�
- textRenderData.setText("澶勭悊鏂瑰紡@Processing");
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else {
- //绗竷鍒楁椂闂�
- textRenderData.setText("鏃堕棿@Date");
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- }
- } else {
- //鍏朵粬琛�
- if (j == 0) {
- //绗竴鍒�
- try {
- String sampleName = processDeals.get((i - 1) + (index1 - 1) * 20).getSampleName();
- textRenderData.setText(index + "");
- } catch (Exception e) {
- textRenderData.setText("");
- }
- index++;
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else if (j == 1) {
- try {
- textRenderData.setText(processDeals.get((i - 1) + (index1 - 1) * 20).getSampleName());
- } catch (Exception e) {
- textRenderData.setText("");
- }
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else if (j == 2) {
- try {
- textRenderData.setText(processDeals.get((i - 1) + (index1 - 1) * 20).getSampleCode());
- } catch (Exception e) {
- textRenderData.setText("");
- }
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else if (j == 3) {
- try {
- textRenderData.setText(processDeals.get((i - 1) + (index1 - 1) * 20).getSampleSupplier());
- } catch (Exception e) {
- textRenderData.setText("");
- }
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else if (j == 4) {
- try {
- textRenderData.setText(processDeals.get((i - 1) + (index1 - 1) * 20).getNum() + "");
- } catch (Exception e) {
- textRenderData.setText("");
- }
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else if (j == 5) {
- try {
- textRenderData.setText(processDeals.get((i - 1) + (index1 - 1) * 20).getDealMethod());
- } catch (Exception e) {
- textRenderData.setText("");
- }
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- } else {
- try {
- textRenderData.setText(processDeals.get((i - 1) + (index1 - 1) * 20).getDealTime() + "");
- } catch (Exception e) {
- textRenderData.setText("");
- }
- renderData.add(textRenderData);
- paragraphRenderData.setContents(renderData);
- paragraphRenderDataList.add(paragraphRenderData);
- cellRenderData.setParagraphs(paragraphRenderDataList);
- cells.add(cellRenderData);
- }
- }
- }
- rowRenderData.setCells(cells);
- if (rowRenderData.getCells().size() != 0) {
- rows.add(rowRenderData);
- }
+ //鏂板璇︽儏琛�
+ //1.鑾峰彇璇ユ湀浠界殑绗竴澶╁拰鏈�鍚庝竴澶�
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
+ YearMonth yearMonth = YearMonth.parse(month, formatter);
+ LocalDate firstDay = yearMonth.atDay(1);
+ LocalDate lastDay = yearMonth.atEndOfMonth();
+ //2.鏌ヨ鍦ㄨ繖涓椂闂磋寖鍥村唴鐨勬墍鏈夋牱鍝佺櫥璁扮殑鏁版嵁
+ List<ProcessSample> processSamples = processSampleMapper.selectList(Wrappers.<ProcessSample>lambdaQuery()
+ .between(ProcessSample::getLeaveDate, firstDay, lastDay));
+ if (processSamples.size()>0){
+ //鑾峰彇澶勭悊鏂瑰紡
+ InspectionOrder inspectionOrder = inspectionOrderMapper.selectById(processSamples.get(0).getInspectionOrderId());
+ List<ProcessDeal> processDeals = new ArrayList<>();
+ for (ProcessSample processSample : processSamples) {
+ long count = processDealService.count(Wrappers.<ProcessDeal>lambdaQuery().eq(ProcessDeal::getProcessSampleId, processSample.getId()));
+ if (count>0){
+ continue;
}
- TableRenderData tableRenderData = new TableRenderData();
- tableRenderData.setRows(rows);
- int countSize = tableRenderData.getRows().get(0).getCells().size();
- for (RowRenderData row : tableRenderData.getRows()) {
- if (row.getCells().size() != countSize) {
- throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑");
- }
- }
- TableStyle tableStyle = new TableStyle();
- tableStyle.setWidth(XWPFTable.DEFAULT_PERCENTAGE_WIDTH);
- tableStyle.setAlign(TableRowAlign.CENTER);
- BorderStyle borderStyle = new BorderStyle();
- borderStyle.setColor("000000");
- borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
- borderStyle.setSize(14);
- tableStyle.setLeftBorder(borderStyle);
- tableStyle.setTopBorder(borderStyle);
- tableStyle.setRightBorder(borderStyle);
- tableStyle.setBottomBorder(borderStyle);
- tableRenderData.setTableStyle(tableStyle);
- Map<String, Object> table = new HashMap<>();
- table.put("sample", tableRenderData);
- table.put("index1", index1);
- sampleList.add(table);
- index1++;
+ ProcessDeal processDeal = new ProcessDeal();
+ processDeal.setSampleName(processSample.getSampleName());//鏍峰搧鍚嶇О
+ processDeal.setSampleCode(processSample.getSampleCode());//鏍峰搧缂栧彿
+ processDeal.setSampleSupplier(processSample.getSampleSupplier());//渚涙牱鍗曚綅
+ processDeal.setNum(processSample.getNum());//鏍峰搧鏁伴噺
+ processDeal.setDealMethod(inspectionOrder.getProcessing()==1?"瀹為獙瀹ゅ鐞�":"濮旀墭鍗曚綅鍙栧洖");//澶勭悊鏂瑰紡
+ processDeal.setDealTime(LocalDate.now());//鏃堕棿=褰撳墠鏃堕棿
+ processDeal.setTotaldealId(processTotaldeal.getId());//鎬昏〃id
+ processDeal.setProcessSampleId(processSample.getId());//鏍峰搧鎺ユ敹id
+ processDeals.add(processDeal);
}
+ processDealService.saveBatch(processDeals);
}
- Integer finalIndex = index1;
- XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
- new HashMap<String, Object>() {{
- put("sampleList", sampleList);
- put("size", finalIndex);
- put("examineUrl", null);
- put("ratifyUrl", null);
- put("writeUrl", new FilePictureRenderData(100, 50, imgUrl + "/" + signatureUrl));
- }});
- String name = UUID.randomUUID() + "_鏍峰搧澶勭悊鐢宠琛�" + ".docx";
- try {
- template.writeAndClose(Files.newOutputStream(Paths.get(wordUrl + "/" + name)));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- //澶勭悊涓嫳鏂囨崲琛岀殑闂
- String path = wordUrl + "/" + name;
- try {
- FileInputStream stream1 = new FileInputStream(path);
- XWPFDocument document1 = new XWPFDocument(stream1);
- List<XWPFTable> xwpfTables1 = document1.getTables();
- for (int i = 0; i < xwpfTables1.size(); i++) {
- for (int j = 0; j < xwpfTables1.get(i).getRows().size(); j++) {
- for (int k = 0; k < xwpfTables1.get(i).getRows().get(j).getTableCells().size(); k++) {
- if (xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getText().contains("@")) {
- String text = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getText();
- String[] split = text.split("@");
- xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).removeParagraph(0);
- XWPFParagraph xwpfParagraph = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).addParagraph();
- XWPFRun run = xwpfParagraph.createRun();
- run.setText(split[0]);
- if (ObjectUtils.isNotNull(split[1])) {
- run.addBreak();
- run.setText(split[1]);
- }
- xwpfParagraph.setAlignment(ParagraphAlignment.CENTER);
- }
- }
- }
- }
- FileOutputStream fileOutputStream1 = new FileOutputStream(path);
- document1.write(fileOutputStream1);
- fileOutputStream1.close();
- } catch (FileNotFoundException e) {
- throw new RuntimeException(e);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- return name;
+ return 0;
}
- public int wordInsertUrl(Map<String, Object> map, String url) {
- XWPFTemplate template = XWPFTemplate.compile(url).render(map);
+ @Override
+ public void exportProcessTotaldeal(Integer id, HttpServletResponse response) {
+ List<ProcessDeal> sampleDealDtos = processDealMapper.selectDeal(id);
+ ProcessTotaldeal processTotaldeal = processTotaldealMapper.selectById(id);
+
+ // 鑾峰彇璺緞
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/sample-deal.docx");
+ Configure configure = Configure.builder()
+ .bind("sampleList", new HackLoopTableRenderPolicy())
+ .build();
+ XWPFTemplate template = XWPFTemplate.compile(inputStream, configure).render(
+ new HashMap<String, Object>() {{
+ put("sampleList", sampleDealDtos);
+ put("writeUrl",UserUtils.getFinalUserSignatureUrl(processTotaldeal.getSubmitUser()));//鎻愪氦浜�
+ put("examineUrl", UserUtils.getFinalUserSignatureUrl(processTotaldeal.getExamineUser()));//瀹℃牳浜�
+ put("ratifyUrl", UserUtils.getFinalUserSignatureUrl(processTotaldeal.getRatifyUser()));//鎵瑰噯浜�
+ }});
try {
- template.writeAndClose(Files.newOutputStream(Paths.get(url)));
- } catch (IOException e) {
- throw new RuntimeException(e);
+ response.setContentType("application/msword");
+ String fileName = URLEncoder.encode(
+ "鏍峰搧澶勭悊鐢宠琛�", "UTF-8");
+ response.setHeader("Content-disposition",
+ "attachment;filename=" + fileName + ".docx");
+ OutputStream os = response.getOutputStream();
+ template.write(os);
+ os.flush();
+ os.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException("瀵煎嚭澶辫触");
}
- return 1;
}
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/task/QualitySuperviseSchedule.java b/cnas-process/src/main/java/com/ruoyi/process/task/QualitySuperviseSchedule.java
index 30c545a..0c35317 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/task/QualitySuperviseSchedule.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/task/QualitySuperviseSchedule.java
@@ -32,7 +32,7 @@
* 鎻愰啋濉啓璁惧浣跨敤璁板綍
*/
// @Scheduled(cron = "0/5 * * * * *")
-// @Scheduled(cron = "0 0 9 1 * *") // 姣忔湀1鍙锋墽琛�
+ @Scheduled(cron = "0 0 9 1 * *") // 姣忔湀1鍙锋墽琛�
public void task1() {
// 鏌ヨ褰撴湀鐩戠潱璁″垝
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.M");
diff --git a/cnas-process/src/main/resources/mapper/InspectionOrderMapper.xml b/cnas-process/src/main/resources/mapper/InspectionOrderMapper.xml
index e43189c..ba0c03f 100644
--- a/cnas-process/src/main/resources/mapper/InspectionOrderMapper.xml
+++ b/cnas-process/src/main/resources/mapper/InspectionOrderMapper.xml
@@ -24,5 +24,4 @@
${ew.customSqlSegment}
</if>
</select>
-
</mapper>
diff --git a/cnas-process/src/main/resources/mapper/ProcessDealMapper.xml b/cnas-process/src/main/resources/mapper/ProcessDealMapper.xml
index b7e00d7..282eaa7 100644
--- a/cnas-process/src/main/resources/mapper/ProcessDealMapper.xml
+++ b/cnas-process/src/main/resources/mapper/ProcessDealMapper.xml
@@ -23,4 +23,17 @@
${ew.customSqlSegment}
</if>
</select>
+
+ <select id="selectDeal" resultType="com.ruoyi.process.pojo.ProcessDeal">
+ select ROW_NUMBER() OVER (ORDER BY id) AS indexs,
+ id,
+ sample_name,
+ sample_code,
+ sample_supplier,
+ num,
+ deal_method,
+ deal_time
+ from cnas_process_deal
+ where totaldeal_id = #{id}
+ </select>
</mapper>
diff --git a/cnas-process/src/main/resources/mapper/ProcessOrderDeviceMapper.xml b/cnas-process/src/main/resources/mapper/ProcessOrderDeviceMapper.xml
new file mode 100644
index 0000000..4165595
--- /dev/null
+++ b/cnas-process/src/main/resources/mapper/ProcessOrderDeviceMapper.xml
@@ -0,0 +1,52 @@
+<?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="com.ruoyi.process.mapper.ProcessOrderDeviceMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.process.pojo.ProcessOrderDevice">
+ <id column="id" property="id" />
+ <result column="device_id" property="deviceId" />
+ <result column="inspection_order_id" property="inspectionOrderId" />
+ <result column="sample_code" property="sampleCode" />
+ <result column="use_before" property="useBefore" />
+ <result column="use_after" property="useAfter" />
+ <result column="abnormal" property="abnormal" />
+ <result column="use_start_date" property="useStartDate" />
+ <result column="use_person_id" property="usePersonId" />
+ <result column="use_person" property="usePerson" />
+ <result column="remark" property="remark" />
+ <result column="use_end_date" property="useEndDate" />
+ </resultMap>
+ <select id="selectDeviceNumber" resultType="java.lang.String">
+ select distinct d.management_number
+ from cnas_process_order_device cpod
+ left join device d on d.id = cpod.device_id
+ where cpod.inspection_order_id = #{inspectionOrderId}
+ </select>
+ <select id="selectDeviceIdsByNumbers" resultType="java.lang.Integer">
+ select id
+ from device
+ where management_number in
+ <foreach collection="deviceNumbers" index="index" open="(" separator="," close=")" item="val">
+ #{val}
+ </foreach>
+ </select>
+ <select id="deviceRecordPage" resultType="com.ruoyi.process.pojo.ProcessOrderDevice">
+ select cpod.*,
+ d.device_name,
+ d.management_number
+ from cnas_process_order_device cpod
+ left join device d on d.id = cpod.device_id
+ where 1=1
+ <if test="deviceId != null">
+ and dr.device_id = #{deviceId}
+ </if>
+ <if test="sampleCode != '' and sampleCode != null">
+ and dr.sample_code like concat('%', #{sampleCode}, '%')
+ </if>
+ <if test="managementNumber != '' and managementNumber != null">
+ and d.management_number like concat('%', #{managementNumber}, '%')
+ </if>
+ ORDER BY (cpod.use_start_date IS NULL) desc , cpod.use_start_date DESC
+ </select>
+</mapper>
diff --git a/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml b/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml
index 6c06783..8770f50 100644
--- a/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml
+++ b/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml
@@ -28,7 +28,8 @@
</if>
</select>
<select id="getIds" resultType="com.ruoyi.process.pojo.ProcessReport">
- select cpr.* ,
+ select ROW_NUMBER() OVER (ORDER BY cpr.id) AS indexs,
+ cpr.* ,
u1.name sendUserName
from cnas_process_report cpr
left join user u1 on send_user=u1.id
diff --git a/cnas-process/src/main/resources/mapper/ProcessSampleMapper.xml b/cnas-process/src/main/resources/mapper/ProcessSampleMapper.xml
index 3e27bb6..6ca612d 100644
--- a/cnas-process/src/main/resources/mapper/ProcessSampleMapper.xml
+++ b/cnas-process/src/main/resources/mapper/ProcessSampleMapper.xml
@@ -14,7 +14,6 @@
<result column="update_user" property="updateUser" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
- <result column="total_sample_id" property="totalSampleId" />
<result column="receive_date" property="receiveDate" />
<result column="leave_date" property="leaveDate" />
<result column="deal_time" property="dealTime" />
diff --git a/cnas-process/src/main/resources/mapper/ProcessTotalSampleMapper.xml b/cnas-process/src/main/resources/mapper/ProcessTotalSampleMapper.xml
deleted file mode 100644
index 5d8ac9c..0000000
--- a/cnas-process/src/main/resources/mapper/ProcessTotalSampleMapper.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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="com.ruoyi.process.mapper.ProcessTotalSampleMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.process.pojo.ProcessTotalSample">
- <id column="id" property="id" />
- <result column="examine_user" property="examineUser"/>
- <result column="examine_state" property="examineState"/>
- <result column="examine_url" property="examineUrl"/>
- <result column="examineUserName" property="examineUserName"/>
- <result column="ratify_user" property="ratifyUser"/>
- <result column="ratify_state" property="ratifyState"/>
- <result column="ratify_url" property="ratifyUrl"/>
- <result column="ratifyUserName" property="ratifyUserName"/>
- <result column="submit_user" property="submitUser"/>
- <result column="submit_state" property="submitState"/>
- <result column="submit_url" property="submitUrl"/>
- <result column="submitUserName" property="submitUserName"/>
- <result column="total_num" property="totalNum"/>
- <result column="month" property="month"/>
- <result column="url" property="url"/>
- </resultMap>
- <select id="pageProcessTotalSample" resultType="com.ruoyi.process.pojo.ProcessTotalSample">
- select *
- from (select cpt.*, u1.name examineUserName , u2.name ratifyUserName,u3.name submitUserName
- from cnas_process_total_sample cpt
- left join user u1 on u1.id = examine_user
- left join user u2 on u2.id = ratify_user
- left join user u3 on u3.id = submit_user) A
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
-</mapper>
diff --git a/cnas-process/src/main/resources/mapper/ProcessTotaldealMapper.xml b/cnas-process/src/main/resources/mapper/ProcessTotaldealMapper.xml
index 64f16ae..c6a1bda 100644
--- a/cnas-process/src/main/resources/mapper/ProcessTotaldealMapper.xml
+++ b/cnas-process/src/main/resources/mapper/ProcessTotaldealMapper.xml
@@ -6,19 +6,14 @@
<id column="id" property="id"/>
<result column="examine_user" property="examineUser"/>
<result column="examine_state" property="examineState"/>
- <result column="examine_url" property="examineUrl"/>
<result column="examineUserName" property="examineUserName"/>
<result column="ratify_user" property="ratifyUser"/>
<result column="ratify_state" property="ratifyState"/>
- <result column="ratify_url" property="ratifyUrl"/>
<result column="ratifyUserName" property="ratifyUserName"/>
<result column="submit_user" property="submitUser"/>
<result column="submit_state" property="submitState"/>
- <result column="submit_url" property="submitUrl"/>
<result column="submitUserName" property="submitUserName"/>
- <result column="total_num" property="totalNum"/>
<result column="month" property="month"/>
- <result column="url" property="url"/>
</resultMap>
<select id="pageProcessTotaldeal" resultType="com.ruoyi.process.pojo.ProcessTotaldeal">
select *
diff --git a/cnas-process/src/main/resources/static/report-deal.docx b/cnas-process/src/main/resources/static/report-deal.docx
index fdd74f4..b3c8eb7 100644
--- a/cnas-process/src/main/resources/static/report-deal.docx
+++ b/cnas-process/src/main/resources/static/report-deal.docx
Binary files differ
diff --git a/cnas-process/src/main/resources/static/sample-deal.docx b/cnas-process/src/main/resources/static/sample-deal.docx
index 9021b0a..9401b21 100644
--- a/cnas-process/src/main/resources/static/sample-deal.docx
+++ b/cnas-process/src/main/resources/static/sample-deal.docx
Binary files differ
diff --git a/cnas-process/src/main/resources/static/sample-receive.docx b/cnas-process/src/main/resources/static/sample-receive.docx
index 1035f1c..7030cf9 100644
--- a/cnas-process/src/main/resources/static/sample-receive.docx
+++ b/cnas-process/src/main/resources/static/sample-receive.docx
Binary files differ
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/FeCalibrationScheduleController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/FeCalibrationScheduleController.java
index efa7963..722cceb 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/FeCalibrationScheduleController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/FeCalibrationScheduleController.java
@@ -26,7 +26,7 @@
*
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 02:53:05
*/
@Api(tags = "閲忓�兼函婧愯鍒�")
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/FeIlluminationController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/FeIlluminationController.java
index a96d5a4..3f0ff8c 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/FeIlluminationController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/FeIlluminationController.java
@@ -23,7 +23,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-鐓у害璁板綍琛� 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:15:57
*/
@RestController
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/FeLightningProtectionController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/FeLightningProtectionController.java
index 1d39939..761ac56 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/FeLightningProtectionController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/FeLightningProtectionController.java
@@ -24,7 +24,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-闃查浄妫�娴� 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:16:36
*/
@Api(tags = "璁炬柦鍜岀幆澧冩潯浠惰姹�-闃查浄妫�娴�")
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/FePowerStableController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/FePowerStableController.java
index 215c48f..6b8ee7e 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/FePowerStableController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/FePowerStableController.java
@@ -24,7 +24,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-鐢垫簮绋冲畾鎬� 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:16:52
*/
@Api(tags = "璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-鐢垫簮绋冲畾鎬�")
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceAcceptanceController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceAcceptanceController.java
index 36c9949..c480ac6 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceAcceptanceController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceAcceptanceController.java
@@ -22,7 +22,7 @@
* 鏍囧噯鐗╄川楠屾敹 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-14 03:29:41
*/
@Api(tags = "鏍囧噯鐗╄川楠屾敹")
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceController.java
index 407c129..912fb7b 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceController.java
@@ -23,7 +23,7 @@
* 鏍囧噯鐗╄川娓呭崟 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 03:58:59
*/
@Api(tags = "鏍囧噯鐗╄川娓呭崟")
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceRecordController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceRecordController.java
index da69a88..1d7fd68 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceRecordController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceRecordController.java
@@ -18,7 +18,7 @@
* 鏍囧噯鐗╄川娓呭崟鍊熺敤褰掕繕璁板綍琛� 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-14 01:49:11
*/
@Api(tags = "鏍囧噯鐗╄川娓呭崟鍊熺敤褰掕繕璁板綍")
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/FeTempHumDateController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/FeTempHumDateController.java
index 09fc247..e1285d5 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/FeTempHumDateController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/FeTempHumDateController.java
@@ -22,7 +22,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-娓╂箍搴� 鍖哄煙 -鐖� 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-09 11:02:18
*/
@Api(tags = "娓╂箍搴﹁褰�")
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/ForeignRegisterController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/ForeignRegisterController.java
index 5c48d2f..e2b8212 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/ForeignRegisterController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/ForeignRegisterController.java
@@ -20,7 +20,7 @@
* 澶栨潵浜哄憳鐧昏 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-19 07:17:35
*/
@Api(tags = "澶栨潵浜哄憳鐧昏")
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/InternalWastesController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/InternalWastesController.java
index 2103526..735e72b 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/InternalWastesController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/InternalWastesController.java
@@ -20,7 +20,7 @@
* 瀹夊叏鍐呭姟涓夊簾鐧昏 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-19 06:39:27
*/
@Api(tags = "瀹夊叏鍐呭姟涓夊簾鐧昏")
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/ProcurementSuppliesExpendsController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/ProcurementSuppliesExpendsController.java
index 52a7f8e..4460a06 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/ProcurementSuppliesExpendsController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/ProcurementSuppliesExpendsController.java
@@ -14,7 +14,7 @@
* 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 03:47:19
*/
@Api(tags = "鏈嶅姟鍜屼緵搴斿搧閲囪喘鑰楁潗娑堣��")
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/ProcurementSuppliesListController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/ProcurementSuppliesListController.java
index 8311a65..82a0c6a 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/ProcurementSuppliesListController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/ProcurementSuppliesListController.java
@@ -24,7 +24,7 @@
* 鏈嶅姟涓庝緵搴斿晢 鑰楁潗鍒楄〃 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 04:04:32
*/
@Api(tags = "鏈嶅姟鍜屼緵搴斿搧閲囪喘鑰楁潗")
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/SupplierManagementController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/SupplierManagementController.java
index faeaab7..831d5f4 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/SupplierManagementController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/SupplierManagementController.java
@@ -22,7 +22,7 @@
* 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 02:46:45
*/
@Api(tags = "渚涘簲鍟嗙鐞�")
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/SuppliersDirectoryContentsController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/SuppliersDirectoryContentsController.java
index 2b7aeb5..9a5792e 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/SuppliersDirectoryContentsController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/SuppliersDirectoryContentsController.java
@@ -18,7 +18,7 @@
* 鏈嶅姟鍜屼緵搴斿搧閲囪喘鐩綍 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-12-17 06:14:51
*/
@Api(tags = "渚涘簲鍟嗙鐞嗘爲")
diff --git a/cnas-require/src/main/java/com/ruoyi/require/mapper/FeCalibrationScheduleMapper.java b/cnas-require/src/main/java/com/ruoyi/require/mapper/FeCalibrationScheduleMapper.java
index 9527638..0194659 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/mapper/FeCalibrationScheduleMapper.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/mapper/FeCalibrationScheduleMapper.java
@@ -11,7 +11,7 @@
*
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 02:53:05
*/
public interface FeCalibrationScheduleMapper extends BaseMapper<FeCalibrationSchedule> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/mapper/FeIlluminationDetectionAreaMapper.java b/cnas-require/src/main/java/com/ruoyi/require/mapper/FeIlluminationDetectionAreaMapper.java
index 8c03dbc..7dbbfd2 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/mapper/FeIlluminationDetectionAreaMapper.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/mapper/FeIlluminationDetectionAreaMapper.java
@@ -8,7 +8,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-鐓у害璁板綍琛�-妫�娴嬪尯鍩� Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:16:28
*/
public interface FeIlluminationDetectionAreaMapper extends BaseMapper<FeIlluminationDetectionArea> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/mapper/FeIlluminationMapper.java b/cnas-require/src/main/java/com/ruoyi/require/mapper/FeIlluminationMapper.java
index 8e1dfa1..ec63cdc 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/mapper/FeIlluminationMapper.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/mapper/FeIlluminationMapper.java
@@ -12,7 +12,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-鐓у害璁板綍琛� Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:15:57
*/
public interface FeIlluminationMapper extends BaseMapper<FeIllumination> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/mapper/FeLightningProtectionMapper.java b/cnas-require/src/main/java/com/ruoyi/require/mapper/FeLightningProtectionMapper.java
index f32393a..995561e 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/mapper/FeLightningProtectionMapper.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/mapper/FeLightningProtectionMapper.java
@@ -11,7 +11,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-闃查浄妫�娴� Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:16:36
*/
public interface FeLightningProtectionMapper extends BaseMapper<FeLightningProtection> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/mapper/FeMeasuredQuantityMapper.java b/cnas-require/src/main/java/com/ruoyi/require/mapper/FeMeasuredQuantityMapper.java
index 9b25b5e..86cca2d 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/mapper/FeMeasuredQuantityMapper.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/mapper/FeMeasuredQuantityMapper.java
@@ -8,7 +8,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-鐢垫簮绋冲畾鎬�-娴嬪畾閲� Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:16:44
*/
public interface FeMeasuredQuantityMapper extends BaseMapper<FeMeasuredQuantity> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/mapper/FePowerStableMapper.java b/cnas-require/src/main/java/com/ruoyi/require/mapper/FePowerStableMapper.java
index 95ec45e..7f345bc 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/mapper/FePowerStableMapper.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/mapper/FePowerStableMapper.java
@@ -16,7 +16,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-鐢垫簮绋冲畾鎬� Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:16:52
*/
public interface FePowerStableMapper extends BaseMapper<FePowerStable> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/mapper/FeStandardSubstanceAcceptanceInspectionMapper.java b/cnas-require/src/main/java/com/ruoyi/require/mapper/FeStandardSubstanceAcceptanceInspectionMapper.java
index d65993b..0eea361 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/mapper/FeStandardSubstanceAcceptanceInspectionMapper.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/mapper/FeStandardSubstanceAcceptanceInspectionMapper.java
@@ -8,7 +8,7 @@
* 楠屾敹寮�绠辫褰� Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-14 03:30:09
*/
public interface FeStandardSubstanceAcceptanceInspectionMapper extends BaseMapper<FeStandardSubstanceAcceptanceInspection> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/mapper/FeStandardSubstanceAcceptanceMapper.java b/cnas-require/src/main/java/com/ruoyi/require/mapper/FeStandardSubstanceAcceptanceMapper.java
index cc14a6c..b43f56d 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/mapper/FeStandardSubstanceAcceptanceMapper.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/mapper/FeStandardSubstanceAcceptanceMapper.java
@@ -12,7 +12,7 @@
* 鏍囧噯鐗╄川楠屾敹 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-14 03:29:41
*/
public interface FeStandardSubstanceAcceptanceMapper extends BaseMapper<FeStandardSubstanceAcceptance> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/mapper/FeStandardSubstanceMapper.java b/cnas-require/src/main/java/com/ruoyi/require/mapper/FeStandardSubstanceMapper.java
index 2340206..e544c4a 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/mapper/FeStandardSubstanceMapper.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/mapper/FeStandardSubstanceMapper.java
@@ -11,7 +11,7 @@
* 鏍囧噯鐗╄川娓呭崟 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 03:58:59
*/
public interface FeStandardSubstanceMapper extends BaseMapper<FeStandardSubstance> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/mapper/FeStandardSubstanceRecordMapper.java b/cnas-require/src/main/java/com/ruoyi/require/mapper/FeStandardSubstanceRecordMapper.java
index c847574..c12e23d 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/mapper/FeStandardSubstanceRecordMapper.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/mapper/FeStandardSubstanceRecordMapper.java
@@ -12,7 +12,7 @@
* 鏍囧噯鐗╄川娓呭崟鍊熺敤褰掕繕璁板綍琛� Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-14 01:49:11
*/
public interface FeStandardSubstanceRecordMapper extends BaseMapper<FeStandardSubstanceRecord> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/mapper/FeTempHumDateMapper.java b/cnas-require/src/main/java/com/ruoyi/require/mapper/FeTempHumDateMapper.java
index 74e7017..a3f00ac 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/mapper/FeTempHumDateMapper.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/mapper/FeTempHumDateMapper.java
@@ -13,7 +13,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-娓╂箍搴� 鍖哄煙 -鐖� Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-09 11:02:18
*/
public interface FeTempHumDateMapper extends BaseMapper<FeTempHumDate> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/mapper/FeTempHumRecordMapper.java b/cnas-require/src/main/java/com/ruoyi/require/mapper/FeTempHumRecordMapper.java
index a54d597..e132e14 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/mapper/FeTempHumRecordMapper.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/mapper/FeTempHumRecordMapper.java
@@ -15,7 +15,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-娓╂箍搴﹁褰� Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:28:52
*/
public interface FeTempHumRecordMapper extends BaseMapper<FeTempHumRecord> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/mapper/ForeignRegisterMapper.java b/cnas-require/src/main/java/com/ruoyi/require/mapper/ForeignRegisterMapper.java
index d4d21ba..f81c973 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/mapper/ForeignRegisterMapper.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/mapper/ForeignRegisterMapper.java
@@ -15,7 +15,7 @@
* 澶栨潵浜哄憳鐧昏 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-19 07:17:35
*/
public interface ForeignRegisterMapper extends BaseMapper<ForeignRegister> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/mapper/InternalWastesDetailMapper.java b/cnas-require/src/main/java/com/ruoyi/require/mapper/InternalWastesDetailMapper.java
index 39004eb..58525cf 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/mapper/InternalWastesDetailMapper.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/mapper/InternalWastesDetailMapper.java
@@ -8,7 +8,7 @@
* 瀹夊叏鍐呭姟涓夊簾鐧昏璇︽儏 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-19 06:39:54
*/
public interface InternalWastesDetailMapper extends BaseMapper<InternalWastesDetail> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/mapper/InternalWastesMapper.java b/cnas-require/src/main/java/com/ruoyi/require/mapper/InternalWastesMapper.java
index 75215d3..1d91e2b 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/mapper/InternalWastesMapper.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/mapper/InternalWastesMapper.java
@@ -14,7 +14,7 @@
* 瀹夊叏鍐呭姟涓夊簾鐧昏 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-19 06:39:27
*/
@Mapper
diff --git a/cnas-require/src/main/java/com/ruoyi/require/mapper/ProcurementSuppliesExpendsMapper.java b/cnas-require/src/main/java/com/ruoyi/require/mapper/ProcurementSuppliesExpendsMapper.java
index 08df116..217f106 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/mapper/ProcurementSuppliesExpendsMapper.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/mapper/ProcurementSuppliesExpendsMapper.java
@@ -8,7 +8,7 @@
* Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 03:47:19
*/
public interface ProcurementSuppliesExpendsMapper extends BaseMapper<ProcurementSuppliesExpends> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/mapper/ProcurementSuppliesListMapper.java b/cnas-require/src/main/java/com/ruoyi/require/mapper/ProcurementSuppliesListMapper.java
index e5cfb35..ad5ec8d 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/mapper/ProcurementSuppliesListMapper.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/mapper/ProcurementSuppliesListMapper.java
@@ -15,7 +15,7 @@
* 鏈嶅姟涓庝緵搴斿晢 鑰楁潗鍒楄〃 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 04:04:32
*/
@Mapper
diff --git a/cnas-require/src/main/java/com/ruoyi/require/mapper/SupplierManagementMapper.java b/cnas-require/src/main/java/com/ruoyi/require/mapper/SupplierManagementMapper.java
index 48abcbc..d22d549 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/mapper/SupplierManagementMapper.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/mapper/SupplierManagementMapper.java
@@ -15,7 +15,7 @@
* Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 02:46:45
*/
@Mapper
diff --git a/cnas-require/src/main/java/com/ruoyi/require/mapper/SuppliersDirectoryContentsMapper.java b/cnas-require/src/main/java/com/ruoyi/require/mapper/SuppliersDirectoryContentsMapper.java
index b2e8b89..9ebedff 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/mapper/SuppliersDirectoryContentsMapper.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/mapper/SuppliersDirectoryContentsMapper.java
@@ -8,7 +8,7 @@
* 鏈嶅姟鍜屼緵搴斿搧閲囪喘鐩綍 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-12-17 06:14:51
*/
public interface SuppliersDirectoryContentsMapper extends BaseMapper<SuppliersDirectoryContents> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeCalibrationSchedule.java b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeCalibrationSchedule.java
index 8cbbfea..0973ee5 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeCalibrationSchedule.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeCalibrationSchedule.java
@@ -14,7 +14,7 @@
* 浠櫒璁惧妫�瀹�/鏍″噯璁″垝琛�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 02:53:05
*/
@Getter
diff --git a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeIllumination.java b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeIllumination.java
index bc63720..ded1a37 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeIllumination.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeIllumination.java
@@ -15,7 +15,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-鐓у害璁板綍琛�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:15:57
*/
@Getter
diff --git a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeIlluminationDetectionArea.java b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeIlluminationDetectionArea.java
index 5e8a99e..68af52b 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeIlluminationDetectionArea.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeIlluminationDetectionArea.java
@@ -16,7 +16,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-鐓у害璁板綍琛�-妫�娴嬪尯鍩�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:16:28
*/
@Getter
diff --git a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeLightningProtection.java b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeLightningProtection.java
index 0b7e893..6870a4a 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeLightningProtection.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeLightningProtection.java
@@ -17,7 +17,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-闃查浄妫�娴�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:16:36
*/
@Getter
diff --git a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeMeasuredQuantity.java b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeMeasuredQuantity.java
index 1fdd836..51ce50d 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeMeasuredQuantity.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeMeasuredQuantity.java
@@ -14,7 +14,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-鐢垫簮绋冲畾鎬�-娴嬪畾閲�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:16:44
*/
@Getter
diff --git a/cnas-require/src/main/java/com/ruoyi/require/pojo/FePowerStable.java b/cnas-require/src/main/java/com/ruoyi/require/pojo/FePowerStable.java
index d7238e0..4a67585 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/pojo/FePowerStable.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/pojo/FePowerStable.java
@@ -15,7 +15,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-鐢垫簮绋冲畾鎬�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:16:52
*/
@Getter
diff --git a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstance.java b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstance.java
index 0cd1cb7..613abb9 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstance.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstance.java
@@ -14,7 +14,7 @@
* 鏍囧噯鐗╄川娓呭崟
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 03:58:59
*/
@Getter
diff --git a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceAcceptance.java b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceAcceptance.java
index 8bd2483..2ad5d89 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceAcceptance.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceAcceptance.java
@@ -18,7 +18,7 @@
* 鏍囧噯鐗╄川楠屾敹
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-14 03:29:41
*/
@Getter
diff --git a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceAcceptanceInspection.java b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceAcceptanceInspection.java
index 50adcc3..763f516 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceAcceptanceInspection.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceAcceptanceInspection.java
@@ -13,7 +13,7 @@
* 楠屾敹寮�绠辫褰�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-14 03:30:09
*/
@Getter
diff --git a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceRecord.java b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceRecord.java
index da5fa7c..d362c83 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceRecord.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceRecord.java
@@ -14,7 +14,7 @@
* 鏍囧噯鐗╄川娓呭崟鍊熺敤褰掕繕璁板綍琛�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-14 01:49:11
*/
@Getter
diff --git a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeTempHumDate.java b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeTempHumDate.java
index 2e3c360..abcd284 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeTempHumDate.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeTempHumDate.java
@@ -13,7 +13,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-娓╂箍搴� 鍖哄煙 -鐖�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-09 11:02:18
*/
@Getter
diff --git a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeTempHumRecord.java b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeTempHumRecord.java
index 8e0910f..68ec3b0 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeTempHumRecord.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeTempHumRecord.java
@@ -17,7 +17,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-娓╂箍搴﹁褰�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:28:52
*/
@Getter
diff --git a/cnas-require/src/main/java/com/ruoyi/require/pojo/ForeignRegister.java b/cnas-require/src/main/java/com/ruoyi/require/pojo/ForeignRegister.java
index b655e0b..0d95d7b 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/pojo/ForeignRegister.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/pojo/ForeignRegister.java
@@ -14,7 +14,7 @@
* 澶栨潵浜哄憳鐧昏
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-19 07:17:35
*/
@Data
diff --git a/cnas-require/src/main/java/com/ruoyi/require/pojo/InternalWastes.java b/cnas-require/src/main/java/com/ruoyi/require/pojo/InternalWastes.java
index a56ed4e..e59d2a0 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/pojo/InternalWastes.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/pojo/InternalWastes.java
@@ -12,7 +12,7 @@
* 瀹夊叏鍐呭姟涓夊簾鐧昏
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-19 06:39:27
*/
@Data
diff --git a/cnas-require/src/main/java/com/ruoyi/require/pojo/InternalWastesDetail.java b/cnas-require/src/main/java/com/ruoyi/require/pojo/InternalWastesDetail.java
index ac9ce0c..2190eba 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/pojo/InternalWastesDetail.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/pojo/InternalWastesDetail.java
@@ -12,7 +12,7 @@
* 瀹夊叏鍐呭姟涓夊簾鐧昏璇︽儏
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-19 06:39:54
*/
@Data
diff --git a/cnas-require/src/main/java/com/ruoyi/require/pojo/ProcurementSuppliesExpends.java b/cnas-require/src/main/java/com/ruoyi/require/pojo/ProcurementSuppliesExpends.java
index 731a523..4666b82 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/pojo/ProcurementSuppliesExpends.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/pojo/ProcurementSuppliesExpends.java
@@ -15,7 +15,7 @@
*
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 03:47:19
*/
@Getter
diff --git a/cnas-require/src/main/java/com/ruoyi/require/pojo/ProcurementSuppliesList.java b/cnas-require/src/main/java/com/ruoyi/require/pojo/ProcurementSuppliesList.java
index eda754b..fabc09a 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/pojo/ProcurementSuppliesList.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/pojo/ProcurementSuppliesList.java
@@ -17,7 +17,7 @@
* 鏈嶅姟涓庝緵搴斿晢 鑰楁潗鍒楄〃
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 04:04:32
*/
@Getter
diff --git a/cnas-require/src/main/java/com/ruoyi/require/pojo/SupplierManagement.java b/cnas-require/src/main/java/com/ruoyi/require/pojo/SupplierManagement.java
index d105000..a44e351 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/pojo/SupplierManagement.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/pojo/SupplierManagement.java
@@ -14,7 +14,7 @@
*
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 02:46:45
*/
@Getter
diff --git a/cnas-require/src/main/java/com/ruoyi/require/pojo/SuppliersDirectoryContents.java b/cnas-require/src/main/java/com/ruoyi/require/pojo/SuppliersDirectoryContents.java
index 8d43ecc..b658514 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/pojo/SuppliersDirectoryContents.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/pojo/SuppliersDirectoryContents.java
@@ -15,7 +15,7 @@
* 鏈嶅姟鍜屼緵搴斿搧閲囪喘鐩綍
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-12-17 06:14:51
*/
@Getter
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/FeCalibrationScheduleService.java b/cnas-require/src/main/java/com/ruoyi/require/service/FeCalibrationScheduleService.java
index aaebd46..f707ba0 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/FeCalibrationScheduleService.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/FeCalibrationScheduleService.java
@@ -11,7 +11,7 @@
*
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 02:53:05
*/
public interface FeCalibrationScheduleService extends IService<FeCalibrationSchedule> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/FeIlluminationDetectionAreaService.java b/cnas-require/src/main/java/com/ruoyi/require/service/FeIlluminationDetectionAreaService.java
index c58efc1..a94cdf9 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/FeIlluminationDetectionAreaService.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/FeIlluminationDetectionAreaService.java
@@ -8,7 +8,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-鐓у害璁板綍琛�-妫�娴嬪尯鍩� 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:16:28
*/
public interface FeIlluminationDetectionAreaService extends IService<FeIlluminationDetectionArea> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/FeIlluminationService.java b/cnas-require/src/main/java/com/ruoyi/require/service/FeIlluminationService.java
index 0fc5100..2608ff0 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/FeIlluminationService.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/FeIlluminationService.java
@@ -13,7 +13,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-鐓у害璁板綍琛� 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:15:57
*/
public interface FeIlluminationService extends IService<FeIllumination> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/FeLightningProtectionService.java b/cnas-require/src/main/java/com/ruoyi/require/service/FeLightningProtectionService.java
index effd73c..8e82dbf 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/FeLightningProtectionService.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/FeLightningProtectionService.java
@@ -11,7 +11,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-闃查浄妫�娴� 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:16:36
*/
public interface FeLightningProtectionService extends IService<FeLightningProtection> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/FeMeasuredQuantityService.java b/cnas-require/src/main/java/com/ruoyi/require/service/FeMeasuredQuantityService.java
index b4f4832..be296f4 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/FeMeasuredQuantityService.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/FeMeasuredQuantityService.java
@@ -8,7 +8,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-鐢垫簮绋冲畾鎬�-娴嬪畾閲� 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:16:44
*/
public interface FeMeasuredQuantityService extends IService<FeMeasuredQuantity> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/FePowerStableService.java b/cnas-require/src/main/java/com/ruoyi/require/service/FePowerStableService.java
index 6ad3b0f..57f0676 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/FePowerStableService.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/FePowerStableService.java
@@ -15,7 +15,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-鐢垫簮绋冲畾鎬� 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:16:52
*/
public interface FePowerStableService extends IService<FePowerStable> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/FeStandardSubstanceAcceptanceInspectionService.java b/cnas-require/src/main/java/com/ruoyi/require/service/FeStandardSubstanceAcceptanceInspectionService.java
index ea02235..66bb307 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/FeStandardSubstanceAcceptanceInspectionService.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/FeStandardSubstanceAcceptanceInspectionService.java
@@ -8,7 +8,7 @@
* 楠屾敹寮�绠辫褰� 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-14 03:30:09
*/
public interface FeStandardSubstanceAcceptanceInspectionService extends IService<FeStandardSubstanceAcceptanceInspection> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/FeStandardSubstanceAcceptanceService.java b/cnas-require/src/main/java/com/ruoyi/require/service/FeStandardSubstanceAcceptanceService.java
index ba3a70e..fb0681e 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/FeStandardSubstanceAcceptanceService.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/FeStandardSubstanceAcceptanceService.java
@@ -15,7 +15,7 @@
* 鏍囧噯鐗╄川楠屾敹 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-14 03:29:41
*/
public interface FeStandardSubstanceAcceptanceService extends IService<FeStandardSubstanceAcceptance> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/FeStandardSubstanceRecordService.java b/cnas-require/src/main/java/com/ruoyi/require/service/FeStandardSubstanceRecordService.java
index a77f503..4e52b9a 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/FeStandardSubstanceRecordService.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/FeStandardSubstanceRecordService.java
@@ -13,7 +13,7 @@
* 鏍囧噯鐗╄川娓呭崟鍊熺敤褰掕繕璁板綍琛� 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-14 01:49:11
*/
public interface FeStandardSubstanceRecordService extends IService<FeStandardSubstanceRecord> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/FeStandardSubstanceService.java b/cnas-require/src/main/java/com/ruoyi/require/service/FeStandardSubstanceService.java
index 374db35..19b2d9a 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/FeStandardSubstanceService.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/FeStandardSubstanceService.java
@@ -10,7 +10,7 @@
* 鏍囧噯鐗╄川娓呭崟 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 03:58:59
*/
public interface FeStandardSubstanceService extends IService<FeStandardSubstance> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/FeTempHumDateService.java b/cnas-require/src/main/java/com/ruoyi/require/service/FeTempHumDateService.java
index 19572cf..cb43f4b 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/FeTempHumDateService.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/FeTempHumDateService.java
@@ -13,7 +13,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-娓╂箍搴� 鍖哄煙 -鐖� 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-09 11:02:18
*/
public interface FeTempHumDateService extends IService<FeTempHumDate> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/FeTempHumRecordService.java b/cnas-require/src/main/java/com/ruoyi/require/service/FeTempHumRecordService.java
index 3e6f45e..392bd66 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/FeTempHumRecordService.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/FeTempHumRecordService.java
@@ -11,7 +11,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-娓╂箍搴﹁褰� 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:28:52
*/
public interface FeTempHumRecordService extends IService<FeTempHumRecord> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/ForeignRegisterService.java b/cnas-require/src/main/java/com/ruoyi/require/service/ForeignRegisterService.java
index 1034ac5..a69af77 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/ForeignRegisterService.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/ForeignRegisterService.java
@@ -13,7 +13,7 @@
* 澶栨潵浜哄憳鐧昏 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-19 07:17:35
*/
public interface ForeignRegisterService extends IService<ForeignRegister> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/InternalWastesDetailService.java b/cnas-require/src/main/java/com/ruoyi/require/service/InternalWastesDetailService.java
index 17805ce..9540ac5 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/InternalWastesDetailService.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/InternalWastesDetailService.java
@@ -8,7 +8,7 @@
* 瀹夊叏鍐呭姟涓夊簾鐧昏璇︽儏 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-19 06:39:54
*/
public interface InternalWastesDetailService extends IService<InternalWastesDetail> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/InternalWastesService.java b/cnas-require/src/main/java/com/ruoyi/require/service/InternalWastesService.java
index 06ad0e8..f9e0129 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/InternalWastesService.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/InternalWastesService.java
@@ -13,7 +13,7 @@
* 瀹夊叏鍐呭姟涓夊簾鐧昏 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-19 06:39:27
*/
public interface InternalWastesService extends IService<InternalWastes> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/ProcurementSuppliesExpendsService.java b/cnas-require/src/main/java/com/ruoyi/require/service/ProcurementSuppliesExpendsService.java
index f5ef01a..12c852f 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/ProcurementSuppliesExpendsService.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/ProcurementSuppliesExpendsService.java
@@ -12,7 +12,7 @@
* 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 03:47:19
*/
public interface ProcurementSuppliesExpendsService extends IService<ProcurementSuppliesExpends> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/ProcurementSuppliesListService.java b/cnas-require/src/main/java/com/ruoyi/require/service/ProcurementSuppliesListService.java
index d604d6f..dca5b63 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/ProcurementSuppliesListService.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/ProcurementSuppliesListService.java
@@ -13,7 +13,7 @@
* 鏈嶅姟涓庝緵搴斿晢 鑰楁潗鍒楄〃 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 04:04:32
*/
public interface ProcurementSuppliesListService extends IService<ProcurementSuppliesList> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/SupplierManagementService.java b/cnas-require/src/main/java/com/ruoyi/require/service/SupplierManagementService.java
index e4ebd7f..6a1a44e 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/SupplierManagementService.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/SupplierManagementService.java
@@ -13,7 +13,7 @@
* 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 02:46:45
*/
public interface SupplierManagementService extends IService<SupplierManagement> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/SuppliersDirectoryContentsService.java b/cnas-require/src/main/java/com/ruoyi/require/service/SuppliersDirectoryContentsService.java
index a6db661..b69d4ac 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/SuppliersDirectoryContentsService.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/SuppliersDirectoryContentsService.java
@@ -12,7 +12,7 @@
* 鏈嶅姟鍜屼緵搴斿搧閲囪喘鐩綍 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-12-17 06:14:51
*/
public interface SuppliersDirectoryContentsService extends IService<SuppliersDirectoryContents> {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeCalibrationScheduleServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeCalibrationScheduleServiceImpl.java
index c72a092..4153bc4 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeCalibrationScheduleServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeCalibrationScheduleServiceImpl.java
@@ -23,7 +23,7 @@
*
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 02:53:05
*/
@Service
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeIlluminationDetectionAreaServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeIlluminationDetectionAreaServiceImpl.java
index 739d3b5..bca9ee3 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeIlluminationDetectionAreaServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeIlluminationDetectionAreaServiceImpl.java
@@ -11,7 +11,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-鐓у害璁板綍琛�-妫�娴嬪尯鍩� 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:16:28
*/
@Service
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeIlluminationServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeIlluminationServiceImpl.java
index 85ba721..956656b 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeIlluminationServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeIlluminationServiceImpl.java
@@ -36,7 +36,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-鐓у害璁板綍琛� 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:15:57
*/
@Service
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeLightningProtectionServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeLightningProtectionServiceImpl.java
index 6eeed39..f17fa50 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeLightningProtectionServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeLightningProtectionServiceImpl.java
@@ -14,7 +14,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-闃查浄妫�娴� 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:16:36
*/
@Service
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeMeasuredQuantityServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeMeasuredQuantityServiceImpl.java
index 6dd7936..5c784b3 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeMeasuredQuantityServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeMeasuredQuantityServiceImpl.java
@@ -11,7 +11,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-鐢垫簮绋冲畾鎬�-娴嬪畾閲� 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:16:44
*/
@Service
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FePowerStableServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FePowerStableServiceImpl.java
index d5f2174..e0d6456 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FePowerStableServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FePowerStableServiceImpl.java
@@ -36,7 +36,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-鐢垫簮绋冲畾鎬� 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:16:52
*/
@Service
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceAcceptanceInspectionServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceAcceptanceInspectionServiceImpl.java
index 1e2cd6e..d9e90ec 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceAcceptanceInspectionServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceAcceptanceInspectionServiceImpl.java
@@ -11,7 +11,7 @@
* 楠屾敹寮�绠辫褰� 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-14 03:30:09
*/
@Service
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceAcceptanceServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceAcceptanceServiceImpl.java
index 291b440..c9c032e 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceAcceptanceServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceAcceptanceServiceImpl.java
@@ -35,7 +35,7 @@
* 鏍囧噯鐗╄川楠屾敹 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-14 03:29:41
*/
@Service
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceRecordServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceRecordServiceImpl.java
index c02f6dc..ea7257b 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceRecordServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceRecordServiceImpl.java
@@ -24,7 +24,7 @@
* 鏍囧噯鐗╄川娓呭崟鍊熺敤褰掕繕璁板綍琛� 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-14 01:49:11
*/
@Transactional(rollbackFor = Exception.class)
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceServiceImpl.java
index 141246c..2dd1a9c 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceServiceImpl.java
@@ -13,7 +13,7 @@
* 鏍囧噯鐗╄川娓呭崟 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-13 03:58:59
*/
@Service
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeTempHumDateServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeTempHumDateServiceImpl.java
index 35960b2..be94840 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeTempHumDateServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeTempHumDateServiceImpl.java
@@ -41,7 +41,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-娓╂箍搴� 鍖哄煙 -鐖� 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-09 11:02:18
*/
@Service
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeTempHumRecordServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeTempHumRecordServiceImpl.java
index 0f8f015..c18fdd6 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeTempHumRecordServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeTempHumRecordServiceImpl.java
@@ -15,7 +15,7 @@
* 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-娓╂箍搴﹁褰� 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-07 04:28:52
*/
@Service
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/ForeignRegisterServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/ForeignRegisterServiceImpl.java
index a32af2c..3a7afa6 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/ForeignRegisterServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/ForeignRegisterServiceImpl.java
@@ -30,7 +30,7 @@
* 澶栨潵浜哄憳鐧昏 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-19 07:17:35
*/
@Service
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/InternalWastesDetailServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/InternalWastesDetailServiceImpl.java
index 80be802..6c6cefa 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/InternalWastesDetailServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/InternalWastesDetailServiceImpl.java
@@ -11,7 +11,7 @@
* 瀹夊叏鍐呭姟涓夊簾鐧昏璇︽儏 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-19 06:39:54
*/
@Service
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/InternalWastesServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/InternalWastesServiceImpl.java
index a7debfb..e760974 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/InternalWastesServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/InternalWastesServiceImpl.java
@@ -31,7 +31,7 @@
* 瀹夊叏鍐呭姟涓夊簾鐧昏 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-19 06:39:27
*/
@Service
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/ProcurementSuppliesExpendsServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/ProcurementSuppliesExpendsServiceImpl.java
index 0d1c184..2f8a263 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/ProcurementSuppliesExpendsServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/ProcurementSuppliesExpendsServiceImpl.java
@@ -26,7 +26,7 @@
* 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 03:47:19
*/
@Service
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/ProcurementSuppliesListServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/ProcurementSuppliesListServiceImpl.java
index 2b019b8..e4e32ef 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/ProcurementSuppliesListServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/ProcurementSuppliesListServiceImpl.java
@@ -32,7 +32,7 @@
* 鏈嶅姟涓庝緵搴斿晢 鑰楁潗鍒楄〃 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 04:04:32
*/
@Service
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/SupplierManagementServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/SupplierManagementServiceImpl.java
index 855db1e..fa6d079 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/SupplierManagementServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/SupplierManagementServiceImpl.java
@@ -27,7 +27,7 @@
* 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 02:46:45
*/
@Service
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/SuppliersDirectoryContentsServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/SuppliersDirectoryContentsServiceImpl.java
index ce0bde8..8e7a7f1 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/SuppliersDirectoryContentsServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/SuppliersDirectoryContentsServiceImpl.java
@@ -18,7 +18,7 @@
* 鏈嶅姟鍜屼緵搴斿搧閲囪喘鐩綍 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-12-17 06:14:51
*/
@Service
diff --git a/cnas-require/src/main/java/com/ruoyi/require/task/FeTempHumDateSchedule.java b/cnas-require/src/main/java/com/ruoyi/require/task/FeTempHumDateSchedule.java
index abead17..b721c1d 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/task/FeTempHumDateSchedule.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/task/FeTempHumDateSchedule.java
@@ -86,7 +86,7 @@
* 鑾峰彇娓╁害婀垮害
*/
// @Scheduled(cron = "0/5 * * * * *")
-// @Scheduled(cron = "0 0 9 * * 1-6") // 姣忓ぉ9鐐规墽琛屼竴娆� 闄や簡鏄熸湡澶�
+ @Scheduled(cron = "0 0 9 * * 1-6") // 姣忓ぉ9鐐规墽琛屼竴娆� 闄や簡鏄熸湡澶�
public void task1() {
checkLaboratoriesSchedule();
// 鏍规嵁鏃堕棿闄嶅簭锛岃幏鍙栧埌鏈�鏂扮殑涓�鏉℃暟鎹�
@@ -183,7 +183,7 @@
* 鑾峰彇娓╁害婀垮害
*/
// @Scheduled(cron = "0/5 * * * * *")
-// @Scheduled(cron = "0 0 14 * * 1-5") // 姣忓ぉ14鐐规墽琛屼竴娆� 闄や簡鏄熸湡鍏拰鏄熸湡澶�
+ @Scheduled(cron = "0 0 14 * * 1-5") // 姣忓ぉ14鐐规墽琛屼竴娆� 闄や簡鏄熸湡鍏拰鏄熸湡澶�
public void task2() {
// 妫�鏌ュ疄楠屽鏄惁鏈変换鍔� 濡傛灉娌℃湁鏂板浠诲姟
@@ -295,7 +295,7 @@
* 鑾峰彇娓╁害婀垮害
*/
// @Scheduled(cron = "0/5 * * * * *")
-// @Scheduled(cron = "0 0 9 * * 7") //
+ @Scheduled(cron = "0 0 9 * * 7") //
public void task3() {
checkLaboratoriesSchedule();
@@ -338,7 +338,7 @@
*
*/
// @Scheduled(cron = "0/5 * * * * *")
-// @Scheduled(cron = "0 0 16 * * 1-6") // 姣忓ぉ15鐐规墽琛屼竴娆� 闄や簡鏄熸湡澶�
+ @Scheduled(cron = "0 0 16 * * 1-6") // 姣忓ぉ15鐐规墽琛屼竴娆� 闄や簡鏄熸湡澶�
public void affirmTempHum() {
// 鏌ヨ鏈夋棩鏈熶絾鏄湭濉啓鍚嶅瓧鐨�
List<FeTempHumRecordDto> feTempHumRecordList = feTempHumRecordMapper.selectNoaffirm(LocalDate.now());
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsProductDeviationWarningController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsProductDeviationWarningController.java
index 42ffb37..1f41334 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsProductDeviationWarningController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsProductDeviationWarningController.java
@@ -23,7 +23,7 @@
* 妫�楠岄」鍋忓樊棰勮涓昏〃 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2025-03-28 02:18:02
*/
@RestController
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsReportController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsReportController.java
index a85f42d..a60e47d 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsReportController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsReportController.java
@@ -167,4 +167,18 @@
Integer id = (Integer) param.get("id");
return Result.success(insReportService.sendBackTask(id));
}
+
+ /**
+ * 鎶ュ憡瀵煎嚭
+ * @param dto
+ * @param response
+ * @throws Exception
+ */
+ @ApiOperation(value = "鎶ュ憡瀵煎嚭")
+ @GetMapping("/reportAllExport")
+ @PreAuthorize("@ss.hasPermi('business:reportPreparation')")
+ @PersonalScope(permsName = "business:reportPreparation", objectName = ReportPageDto.class, paramName = "createOrderUser")
+ public void reportAllExport(ReportPageDto dto, HttpServletResponse response) throws Exception {
+ insReportService.reportAllExport(dto,response);
+ }
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsReportExport.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsReportExport.java
new file mode 100644
index 0000000..ab41511
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsReportExport.java
@@ -0,0 +1,75 @@
+package com.ruoyi.inspect.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author zhuo
+ * @Date 2025/4/18
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class InsReportExport {
+
+ @ExcelProperty(value = "鎶ュ憡缂栧彿")
+ @ApiModelProperty("濮旀墭缂栧彿")
+ private String code;
+
+ @ExcelProperty(value = "涓嬪崟绫诲瀷")
+ @ApiModelProperty("涓嬪崟绫诲瀷")
+ private String typeSource;
+
+ @ExcelProperty(value = "妫�楠岀被鍨�")
+ @ApiModelProperty("妫�楠岀被鍨�")
+ private String orderType;
+
+ @ExcelProperty(value = "鍒涘缓鏃堕棿")
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ private String createTime;
+
+ @ExcelProperty(value = "鎻愪氦浜�")
+ @ApiModelProperty("鎻愪氦浜�")
+ private String writeUserName;
+
+ @ExcelProperty(value = "鎻愪氦鏃堕棿")
+ @ApiModelProperty("鎻愪氦鏃堕棿")
+ private String writeTime;
+
+ @ExcelProperty(value = "鎻愪氦鐘舵��")
+ @ApiModelProperty("鎻愪氦鐘舵��")
+ private String state;
+
+ @ExcelProperty(value = "瀹℃牳浜�")
+ @ApiModelProperty("瀹℃牳浜�")
+ private String examineUser;
+
+ @ExcelProperty(value = "瀹℃牳鏃堕棿")
+ @ApiModelProperty("瀹℃牳鏃堕棿")
+ private String examineTime;
+
+ @ExcelProperty(value = "瀹℃牳鐘舵��")
+ @ApiModelProperty("瀹℃牳鐘舵��")
+ private String isExamine;
+
+ @ExcelProperty(value = "瀹℃牳澶囨敞")
+ @ApiModelProperty("瀹℃牳澶囨敞")
+ private String examineTell;
+
+ @ExcelProperty(value = "鎵瑰噯浜�")
+ @ApiModelProperty("鎵瑰噯浜�")
+ private String ratifyUser;
+
+ @ExcelProperty(value = "鎵瑰噯鏃堕棿")
+ @ApiModelProperty("鎵瑰噯鏃堕棿")
+ private String ratifyTime;
+
+ @ExcelProperty(value = "鎵瑰噯鐘舵��")
+ @ApiModelProperty("鎵瑰噯鐘舵��")
+ private String isRatify;
+
+ @ExcelProperty(value = "鎵瑰噯澶囨敞")
+ @ApiModelProperty("鎵瑰噯澶囨敞")
+ private String ratifyTell;
+}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java
index 47eb3a8..bdf55f3 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java
@@ -92,7 +92,8 @@
@ApiModelProperty("鎬讳环")
private String totalPrice;
-
+ @ApiModelProperty("璁㈠崟id(瀵煎嚭鐢�)")
+ private String ids;
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java
index 449c56d..94a172a 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java
@@ -110,6 +110,10 @@
*/
List<InsOrderPrintingVo> labelOrderPrinting(@Param("ids") List<Integer> ids);
+ /**
+ * 鏌ヨ瀵煎嚭淇℃伅
+ * @return
+ */
List<SampleOrderDto> rawAllInsOrderExport(@Param("ew") QueryWrapper<SampleOrderDto> ew, @Param("laboratory") String laboratory, @Param("isOrderAll") String isOrderAll);
/**
@@ -119,5 +123,17 @@
*/
String selectLaboratoryByOrderId(@Param("insOrderId") Integer insOrderId);
+ /**
+ * 鏌ヨ璁㈠崟淇℃伅
+ * @param insSampleId
+ * @return
+ */
InsOrder selectFirstSubmit(@Param("insSampleId") Integer insSampleId);
+
+ /**
+ * 鏍规嵁璁㈠崟id鏌ヨ璁㈠崟瀵煎嚭淇℃伅
+ * @param orderIds
+ * @return
+ */
+ List<SampleOrderDto> getInsOrderExportByIds(@Param("orderIds") List<String> orderIds);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductDeviationWarningDetailMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductDeviationWarningDetailMapper.java
index 97ff637..88d1de0 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductDeviationWarningDetailMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductDeviationWarningDetailMapper.java
@@ -8,7 +8,7 @@
* 妫�楠岄」鍋忓樊棰勮璇︽儏琛� Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2025-03-28 02:18:58
*/
public interface InsProductDeviationWarningDetailMapper extends BaseMapper<InsProductDeviationWarningDetail> {
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductDeviationWarningMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductDeviationWarningMapper.java
index 037a171..ad8eed7 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductDeviationWarningMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductDeviationWarningMapper.java
@@ -13,7 +13,7 @@
* 妫�楠岄」鍋忓樊棰勮涓昏〃 Mapper 鎺ュ彛
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2025-03-28 02:18:02
*/
public interface InsProductDeviationWarningMapper extends BaseMapper<InsProductDeviationWarning> {
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsReportMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsReportMapper.java
index 3f6176e..99c120f 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsReportMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsReportMapper.java
@@ -3,9 +3,12 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ruoyi.inspect.dto.InsReportExport;
import com.ruoyi.inspect.dto.ReportPageDto;
import com.ruoyi.inspect.pojo.InsReport;
import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* @author Administrator
@@ -31,6 +34,14 @@
String getLaboratoryByName(@Param("name") String name, @Param("type") String type);
+ /**
+ * 鎶ュ憡鎶ヨ〃瀵煎嚭
+ * @return
+ */
+ List<InsReportExport> reportAllExport(@Param("ew") QueryWrapper<ReportPageDto> ew,
+ @Param("userId") Integer userId,
+ @Param("queryStatus") String queryStatus,
+ @Param("createOrderUser") Integer createOrderUser);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarning.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarning.java
index 1bedf2b..6fd2851 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarning.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarning.java
@@ -17,7 +17,7 @@
* 妫�楠岄」鍋忓樊棰勮涓昏〃
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2025-03-28 02:18:02
*/
@Getter
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarningDetail.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarningDetail.java
index 2fa5dc1..5d33071 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarningDetail.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarningDetail.java
@@ -17,7 +17,7 @@
* 妫�楠岄」鍋忓樊棰勮璇︽儏琛�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2025-03-28 02:18:58
*/
@Getter
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductDeviationWarningDetailService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductDeviationWarningDetailService.java
index e75eae1..bdd2750 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductDeviationWarningDetailService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductDeviationWarningDetailService.java
@@ -8,7 +8,7 @@
* 妫�楠岄」鍋忓樊棰勮璇︽儏琛� 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2025-03-28 02:18:58
*/
public interface InsProductDeviationWarningDetailService extends IService<InsProductDeviationWarningDetail> {
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductDeviationWarningService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductDeviationWarningService.java
index 5303108..f057fdd 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductDeviationWarningService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductDeviationWarningService.java
@@ -12,7 +12,7 @@
* 妫�楠岄」鍋忓樊棰勮涓昏〃 鏈嶅姟绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2025-03-28 02:18:02
*/
public interface InsProductDeviationWarningService extends IService<InsProductDeviationWarning> {
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java
index c082507..0959257 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java
@@ -8,7 +8,9 @@
import com.ruoyi.inspect.pojo.InsReport;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.io.UnsupportedEncodingException;
import java.util.Map;
/**
@@ -58,4 +60,11 @@
* @return
*/
boolean sendBackTask(Integer id);
+
+ /**
+ * 鎶ュ憡瀵煎嚭
+ * @param dto
+ * @param response
+ */
+ void reportAllExport(ReportPageDto dto, HttpServletResponse response) throws UnsupportedEncodingException;
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index 848f1da..68ad415 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -822,9 +822,10 @@
// 5.鍙戦�佹秷鎭�氱煡缁欏鏍镐汉
// 鏌ヨ褰撳墠浜轰俊鎭�
Integer userId = SecurityUtils.getUserId().intValue();
- String userName = insProductMapper.selectUserById(userId).get("name");
+ Map<String, String> userMap = insProductMapper.selectUserById(verifyUser);
+ String userName = userMap.get("name");
// 鏌ヨ鍙戦�佷汉淇℃伅
- String sendUserAccount = insProductMapper.selectUserById(verifyUser).get("account");
+ String sendUserAccount = userMap.get("account");
InformationNotification info = new InformationNotification();
info.setCreateUser(userName);
info.setMessageType("2");
@@ -938,7 +939,7 @@
// 鏌ヨifs淇℃伅鑾峰彇鑾峰彇鍓�10涓緵搴斿晢涓�鏍风殑, 妫�楠岄」涓�鏍蜂俊鎭�
threadPoolTaskExecutor.execute(() -> {
// 娣诲姞鍒嗘瀽鏁版嵁
- addAnalysis(productList, ifsInventoryQuantity, order, userName);
+ addAnalysis(productList, ifsInventoryQuantity, order, sendUserAccount);
});
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
index fd03462..a1d32e7 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -992,16 +992,21 @@
*/
@Override
public void rawAllInsOrderExport(SampleOrderDto sampleOrderDto, HttpServletResponse response) {
- //鍒ゆ柇鍏ㄩ儴,涓汉,缁勭粐鐨勬潈闄�
- //todo:浠呯湅鎴戣幏鍙栧綋鍓嶄汉鎵�灞炲疄楠屽id
- String laboratory = null;
- // 鍒ゆ柇鏄惁鏄叏閮�
- String isOrderAll = null;
- if (sampleOrderDto.getState() != null && sampleOrderDto.getState() == -2) {
- isOrderAll = "1";
- sampleOrderDto.setState(null);
+ List<SampleOrderDto> sampleOrderDtoList = new ArrayList<>();
+ if (StringUtils.isNotBlank(sampleOrderDto.getIds())) {
+ List<String> orderIds = StrUtil.split(sampleOrderDto.getIds(), ",");
+ sampleOrderDtoList = insOrderMapper.getInsOrderExportByIds(orderIds);
+ } else {
+ String laboratory = null;
+ // 鍒ゆ柇鏄惁鏄叏閮�
+ String isOrderAll = null;
+ if (sampleOrderDto.getState() != null && sampleOrderDto.getState() == -2) {
+ isOrderAll = "1";
+ sampleOrderDto.setState(null);
+ }
+ sampleOrderDto.setIds(null);
+ sampleOrderDtoList = insOrderMapper.rawAllInsOrderExport(QueryWrappers.queryWrappers(sampleOrderDto), laboratory, isOrderAll);
}
- List<SampleOrderDto> sampleOrderDtoList = insOrderMapper.rawAllInsOrderExport(QueryWrappers.queryWrappers(sampleOrderDto), laboratory, isOrderAll);
// 鍒ゆ柇鏄惁鏄笉鍚堟牸, 涓嶅悎鏍兼煡璇笉鍚堟牸椤�
for (SampleOrderDto orderDto : sampleOrderDtoList) {
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductDeviationWarningDetailServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductDeviationWarningDetailServiceImpl.java
index 4eced2e..8a71136 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductDeviationWarningDetailServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductDeviationWarningDetailServiceImpl.java
@@ -11,7 +11,7 @@
* 妫�楠岄」鍋忓樊棰勮璇︽儏琛� 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2025-03-28 02:18:58
*/
@Service
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductDeviationWarningServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductDeviationWarningServiceImpl.java
index 49865be..89f9ab8 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductDeviationWarningServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductDeviationWarningServiceImpl.java
@@ -15,7 +15,7 @@
* 妫�楠岄」鍋忓樊棰勮涓昏〃 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2025-03-28 02:18:02
*/
@Service
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
index 62012d3..6bde534 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
@@ -1,11 +1,17 @@
package com.ruoyi.inspect.service.impl;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.aspose.words.License;
import com.aspose.words.SaveFormat;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -19,6 +25,7 @@
import com.itextpdf.text.pdf.PdfContentByte;
import com.itextpdf.text.pdf.PdfReader;
import com.itextpdf.text.pdf.PdfStamper;
+import com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto;
import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper;
import com.ruoyi.basic.pojo.IfsInventoryQuantity;
import com.ruoyi.common.constant.InsOrderTypeConstants;
@@ -29,6 +36,7 @@
import com.ruoyi.common.utils.*;
import com.ruoyi.common.utils.api.IfsApiUtils;
import com.ruoyi.framework.exception.ErrorException;
+import com.ruoyi.inspect.dto.InsReportExport;
import com.ruoyi.inspect.dto.ReportPageDto;
import com.ruoyi.inspect.mapper.*;
import com.ruoyi.inspect.pojo.*;
@@ -48,8 +56,10 @@
import javax.annotation.Resource;
import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage;
import java.io.*;
+import java.net.URLEncoder;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -988,6 +998,46 @@
return false;
}
+ /**
+ * 鎶ュ憡鎶ヨ〃瀵煎嚭
+ * @param dto
+ * @param response
+ */
+ @Override
+ public void reportAllExport(ReportPageDto dto, HttpServletResponse response) throws UnsupportedEncodingException {
+
+ Integer createOrderUser = dto.getCreateOrderUser();
+ String queryStatus = dto.getQueryStatus();
+ dto.setQueryStatus(null);
+ dto.setCreateOrderUser(null);
+
+ List<InsReportExport> insReportExports = insReportMapper.reportAllExport(QueryWrappers.queryWrappers(dto),
+ SecurityUtils.getUserId().intValue(),
+ queryStatus,
+ createOrderUser);
+
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("UTF-8");
+ // 杩欓噷URLEncoder.encode鍙互闃叉涓枃涔辩爜 褰撶劧鍜宔asyexcel娌℃湁鍏崇郴
+ String fileName = URLEncoder.encode("鎶ュ憡鎶ヨ〃瀵煎嚭", "UTF-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+ try {
+ //鏂板缓ExcelWriter
+ ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).build();
+ //鑾峰彇sheet0瀵硅薄
+ WriteSheet mainSheet = EasyExcel.writerSheet(0, "鎶ュ憡鎶ヨ〃瀵煎嚭").head(InsReportExport.class).build();
+
+ //鍚憇heet0鍐欏叆鏁版嵁 浼犲叆绌簂ist杩欐牱鍙鍑鸿〃澶�
+ excelWriter.write(insReportExports, mainSheet);
+ //鍏抽棴娴�
+ excelWriter.finish();
+ } catch (IOException e) {
+ throw new RuntimeException("瀵煎嚭澶辫触");
+ }
+
+
+ }
+
/**
* 鍏堜慨鏀归噰璐鍗曟壒娆″彿, 鍚庤繘琛岀Щ搴撴搷浣�
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
index 0d3c844..12982e9 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
@@ -12,6 +12,7 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.*;
@@ -672,12 +673,19 @@
*/
@Override
public void rawAllExport(IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto, HttpServletResponse response) throws UnsupportedEncodingException {
- //鏌ヨ瀵煎嚭鐨勮垂鐢ㄧ粺璁℃暟鎹�
- String beginDeclareDate = ifsInventoryQuantityDto.getBeginDeclareDate();
- String endDeclareDate = ifsInventoryQuantityDto.getEndDeclareDate();
- ifsInventoryQuantityDto.setBeginDeclareDate(null);
- ifsInventoryQuantityDto.setEndDeclareDate(null);
- List<IfsInventoryQuantitySupplierDto> ifsByOverList = standardTreeMapper.getIfsByOverList(QueryWrappers.queryWrappers(ifsInventoryQuantityDto), beginDeclareDate, endDeclareDate);
+ // 鍒ゆ柇鏄惁鏄牴鎹�夋嫨鐨勫鍑�
+ List<IfsInventoryQuantitySupplierDto> ifsByOverList = new ArrayList<>();
+ if (StringUtils.isNotBlank(ifsInventoryQuantityDto.getIds())) {
+ List<String> ifsIds = StrUtil.split(ifsInventoryQuantityDto.getIds(), ",");
+ ifsByOverList = standardTreeMapper.getIfsByIds(ifsIds);
+ } else {
+ String beginDeclareDate = ifsInventoryQuantityDto.getBeginDeclareDate();
+ String endDeclareDate = ifsInventoryQuantityDto.getEndDeclareDate();
+ ifsInventoryQuantityDto.setBeginDeclareDate(null);
+ ifsInventoryQuantityDto.setEndDeclareDate(null);
+ ifsInventoryQuantityDto.setIds(null);
+ ifsByOverList = standardTreeMapper.getIfsByOverList(QueryWrappers.queryWrappers(ifsInventoryQuantityDto), beginDeclareDate, endDeclareDate);
+ }
for (IfsInventoryQuantitySupplierDto dto : ifsByOverList) {
dto.setSendTimeString(dto.getSendTime() == null ? "" : dto.getSendTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 214e7fa..ad38e37 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -45,6 +45,61 @@
ip.cable_tag
</sql>
+ <sql id="selectInsOrderExport">
+ SELECT
+ io.*,
+ isau.user_id assign,
+ ir.id report_id,
+ ir.url,
+ ir.url_s,
+ sample_counts.sample_num,
+ CONCAT(ROUND(approved_product_counts.approved_count / total_product_counts.total_count * 100, 2), '%') AS insProgress,
+ io.sample_view AS sample_name,
+ GROUP_CONCAT(DISTINCT isa.model SEPARATOR ' ') AS sample_model,
+ u.name,
+ testing_name,
+ case when io.type = 0 then '鏅��'
+ when io.type = 1 then '浼樺厛'
+ when io.type = 2 then '绱ф��'
+ end typeString,
+ case when io.ins_result = 1 then '鍚堟牸'
+ when io.ins_result = 0 then '涓嶅悎鏍�'
+ else '寰呮楠�' end insResultString
+ FROM
+ ins_order io
+ LEFT JOIN
+ ins_sample isa ON io.id = isa.ins_order_id
+ LEFT JOIN
+ ins_sample_user isau ON isau.ins_sample_id = io.id
+ LEFT JOIN
+ (SELECT id, ins_order_id, is_ratify, url, url_s FROM ins_report WHERE is_ratify = 1) ir ON io.id = ir.ins_order_id
+ LEFT JOIN
+ user u ON io.create_user = u.id
+ LEFT JOIN
+ (SELECT ins_order_id, COUNT(*) AS sample_num
+ FROM ins_sample
+ WHERE id in(select id1 from (select is2.id id1 ,ip.id from ins_sample is2 left join ins_product ip on is2.id = ip.ins_sample_id where ip.id is not null)s )
+ GROUP BY ins_order_id) sample_counts ON io.id = sample_counts.ins_order_id
+ LEFT JOIN
+ (SELECT ins_sample.ins_order_id, COUNT(*) AS total_count
+ FROM ins_product
+ JOIN ins_sample ON ins_product.ins_sample_id = ins_sample.id
+ WHERE ins_product.state = 1
+ GROUP BY ins_sample.ins_order_id) total_product_counts ON io.id = total_product_counts.ins_order_id
+ LEFT JOIN
+ (SELECT ins_sample.ins_order_id, COUNT(*) AS approved_count
+ FROM ins_product
+ JOIN ins_sample ON ins_product.ins_sample_id = ins_sample.id
+ WHERE ins_product.state = 1 AND ins_product.ins_result IS NOT NULL
+ GROUP BY ins_sample.ins_order_id) approved_product_counts ON io.id = approved_product_counts.ins_order_id
+ LEFT JOIN (SELECT ins_sample_id, GROUP_CONCAT(DISTINCT uu.name SEPARATOR ',') AS testing_name
+ FROM ins_sample_user u
+ LEFT JOIN user uu ON u.user_id = uu.id
+ WHERE u.state = 0
+ GROUP BY ins_sample_id
+ ORDER BY ins_sample_id) isu ON isu.ins_sample_id = io.id
+ </sql>
+
<select id="selectInsOrderPage" resultType="com.ruoyi.inspect.dto.SampleOrderDto">
select *
from (
@@ -356,59 +411,7 @@
<!-- 鏌ヨ妫�楠屽崟鏁版嵁 -->
<select id="rawAllInsOrderExport" resultType="com.ruoyi.inspect.dto.SampleOrderDto">
select *
- from (
- SELECT
- io.*,
- isau.user_id assign,
- ir.id report_id,
- ir.url,
- ir.url_s,
- sample_counts.sample_num,
- CONCAT(ROUND(approved_product_counts.approved_count / total_product_counts.total_count * 100, 2), '%') AS insProgress,
- io.sample_view AS sample_name,
- GROUP_CONCAT(DISTINCT isa.model SEPARATOR ' ') AS sample_model,
- u.name,
- testing_name,
- case when io.type = 0 then '鏅��'
- when io.type = 1 then '浼樺厛'
- when io.type = 2 then '绱ф��'
- end typeString,
- case when io.ins_result = 1 then '鍚堟牸'
- when io.ins_result = 0 then '涓嶅悎鏍�'
- else '寰呮楠�' end insResultString
- FROM
- ins_order io
- LEFT JOIN
- ins_sample isa ON io.id = isa.ins_order_id
- LEFT JOIN
- ins_sample_user isau ON isau.ins_sample_id = io.id
- LEFT JOIN
- (SELECT id, ins_order_id, is_ratify, url, url_s FROM ins_report WHERE is_ratify = 1) ir ON io.id = ir.ins_order_id
- LEFT JOIN
- user u ON io.create_user = u.id
- LEFT JOIN
- (SELECT ins_order_id, COUNT(*) AS sample_num
- FROM ins_sample
- WHERE id in(select id1 from (select is2.id id1 ,ip.id from ins_sample is2 left join ins_product ip on is2.id = ip.ins_sample_id where ip.id is not null)s )
- GROUP BY ins_order_id) sample_counts ON io.id = sample_counts.ins_order_id
- LEFT JOIN
- (SELECT ins_sample.ins_order_id, COUNT(*) AS total_count
- FROM ins_product
- JOIN ins_sample ON ins_product.ins_sample_id = ins_sample.id
- WHERE ins_product.state = 1
- GROUP BY ins_sample.ins_order_id) total_product_counts ON io.id = total_product_counts.ins_order_id
- LEFT JOIN
- (SELECT ins_sample.ins_order_id, COUNT(*) AS approved_count
- FROM ins_product
- JOIN ins_sample ON ins_product.ins_sample_id = ins_sample.id
- WHERE ins_product.state = 1 AND ins_product.ins_result IS NOT NULL
- GROUP BY ins_sample.ins_order_id) approved_product_counts ON io.id = approved_product_counts.ins_order_id
- LEFT JOIN (SELECT ins_sample_id, GROUP_CONCAT(DISTINCT uu.name SEPARATOR ',') AS testing_name
- FROM ins_sample_user u
- LEFT JOIN user uu ON u.user_id = uu.id
- WHERE u.state = 0
- GROUP BY ins_sample_id
- ORDER BY ins_sample_id) isu ON isu.ins_sample_id = io.id
+ from ( <include refid="selectInsOrderExport"/>
where (io.ifs_inventory_id IS NULL OR TRIM(io.ifs_inventory_id) = '')
<if test="isOrderAll != null and isOrderAll != ''">
AND io.state in (1, 4)
@@ -440,4 +443,16 @@
left join ins_sample is2 on is2.ins_order_id = io.id
where is2.id = #{insSampleId}
</select>
+
+ <!-- 鏍规嵁璁㈠崟id鏌ヨ璁㈠崟瀵煎嚭淇℃伅 -->
+ <select id="getInsOrderExportByIds" resultType="com.ruoyi.inspect.dto.SampleOrderDto">
+ <include refid="selectInsOrderExport"/>
+ where (io.ifs_inventory_id IS NULL OR TRIM(io.ifs_inventory_id) = '')
+ and io.id in
+ <foreach item="id" collection="orderIds" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ GROUP BY io.id,type
+ order by type desc,io.id desc
+ </select>
</mapper>
diff --git a/inspect-server/src/main/resources/mapper/InsProductResultMapper.xml b/inspect-server/src/main/resources/mapper/InsProductResultMapper.xml
index 0a42c74..519d61a 100644
--- a/inspect-server/src/main/resources/mapper/InsProductResultMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsProductResultMapper.xml
@@ -31,7 +31,8 @@
<!-- 鏍规嵁璁㈠崟id鏌ヨ妫�楠岀粨鏋� -->
<select id="selectResultByOrderId" resultType="com.ruoyi.inspect.pojo.InsProductResult">
- select ipr.equip_value
+ select ipr.equip_value,
+ ipr.create_user
from ins_product_result ipr
left join ins_product ip on ip.id = ipr.ins_product_id
left join ins_sample is2 on is2.id = ip.ins_sample_id
diff --git a/inspect-server/src/main/resources/mapper/InsReportMapper.xml b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
index f4b741e..fa58164 100644
--- a/inspect-server/src/main/resources/mapper/InsReportMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
@@ -64,4 +64,74 @@
order by s.create_time desc
limit 1
</select>
+
+ <!-- 鎶ュ憡鎶ヨ〃瀵煎嚭 -->
+ <select id="reportAllExport" resultType="com.ruoyi.inspect.dto.InsReportExport">
+ select code,
+ case when type_source = 0 then '鎴愬搧涓嬪崟' else '鍘熸潗鏂欎笅鍗�' end type_source,
+ case
+ when order_type = '鎶芥' then '鎶芥'
+ when order_type = 'Customer-ordered test' then '濮旀墭妫�楠�'
+ when order_type = '杩涘巶妫�楠�' then '杩涘巶妫�楠�'
+ when order_type = 'Quarterly inspection' then '瀛ｅ害妫�楠�'
+ else '' end order_type,
+ DATE_FORMAT(create_Time, '%Y-%m-%d %H:%i:%s') create_Time,
+ write_user_name,
+ DATE_FORMAT(write_time, '%Y-%m-%d %H:%i:%s') write_time,
+ case when state = 0 then '寰呮彁浜�' when state = 1 then '宸叉彁浜�' else '' end state,
+ examine_user,
+ DATE_FORMAT(examine_time, '%Y-%m-%d %H:%i:%s') examine_time,
+ case when is_examine = 0 then '涓嶉�氳繃' when is_examine = 1 then '閫氳繃' else '' end is_examine,
+ examine_tell,
+ ratify_user,
+ DATE_FORMAT(ratify_time, '%Y-%m-%d %H:%i:%s') ratify_time,
+ case when is_ratify = 0 then '涓嶆壒鍑�' when is_ratify = 1 then '鎵瑰噯' else '' end is_ratify,
+ ratify_tell
+ from (
+ select
+ ir.*,
+ io.entrust_code,
+ u.name write_user_name,
+ u1.name ratify_user,
+ u2.name examine_user,
+ io.type_source,
+ io.order_type,
+ io.laboratory,
+ io.ifs_inventory_id,
+ iiq.is_copper,
+ ip.son_laboratory
+ from ins_report ir
+ left join ins_order io on io.id = ir.ins_order_id
+ LEFT JOIN ifs_inventory_quantity iiq ON iiq.id = io.ifs_inventory_id
+ left join user u on u.id = ir.write_user_id
+ left join user u1 on u1.id = ir.ratify_user_id
+ left join user u2 on u2.id = ir.examine_user_id
+ left join ins_sample is2 on is2.ins_order_id = io.id
+ left join ins_product ip on ip.ins_sample_id = is2.id
+ where 1=1
+ and ir.is_pass = 1
+ <if test="createOrderUser != null and createOrderUser != ''">
+ and (ir.write_user_id = #{createOrderUser} or ir.examine_user_id = #{createOrderUser} or ir.ratify_user_id = #{createOrderUser})
+ </if>
+ <if test="queryStatus != null and queryStatus != ''">
+ <!-- 寰呮彁浜�-->
+ <if test='queryStatus == 0'>
+ and ir.state = 0
+ </if>
+ <!-- 寰呭鎵�-->
+ <if test='queryStatus == 1'>
+ and ir.state = 1 and (ir.is_examine != 1 or ir.is_examine is null)
+ </if>
+ <!-- 寰呮壒鍑�-->
+ <if test='queryStatus == 2'>
+ and ir.state = 1 and ir.is_examine = 1 and (ir.is_ratify != 1 or ir.is_ratify is null)
+ </if>
+ </if>
+ group by ir.id
+ ) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ ORDER BY a.create_time DESC
+ </select>
</mapper>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/DeviceImpowerConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/DeviceImpowerConstants.java
new file mode 100644
index 0000000..1971195
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/DeviceImpowerConstants.java
@@ -0,0 +1,65 @@
+package com.ruoyi.common.constant;
+
+/**
+ * @Author zhuo
+ * @Date 2025/4/18
+ */
+public class DeviceImpowerConstants {
+
+ /**
+ * 鑰佸寲瀹ょ淮鎶ゅ唴瀹�
+ */
+ public static final String AGING_MAINTENANCE_CONTENT = "aging_maintenance_content";
+
+ /**
+ * 鐢垫�ц兘瀹為獙瀹ょ淮鎶ゅ唴瀹�
+ */
+ public static final String ELECTRICAL_MAINTENANCE_CONTENT = "electrical_maintenance_content";
+
+ /**
+ * 鐜瀹為獙瀹ょ淮鎶ゅ唴瀹�
+ */
+ public static final String ENVIRONMENTAL_MAINTENANCE_CONTENT = "environmental_maintenance_content";
+
+ /**
+ * 鐕冪儳瀹為獙瀹ょ淮鎶ゅ唴瀹�
+ */
+ public static final String BURN_MAINTENANCE_CONTENT = "burn_maintenance_content";
+
+ /**
+ * 娣风偧瀹為獙瀹ょ淮鎶ゅ唴瀹�
+ */
+ public static final String MIXING_MAINTENANCE_CONTENT = "mixing_maintenance_content";
+
+ /**
+ * 妫�娴嬩腑蹇冪數鎬ц兘瀹為獙瀹ょ淮鎶ゅ唴瀹�
+ */
+ public static final String CENTER_ELECTRICAL_MAINTENANCE_CONTENT = "center_electrical_maintenance_content";
+
+ /**
+ * 鎭掓俯浜岀淮鎶ゅ唴瀹�
+ */
+ public static final String TEMPERATURE2_MAINTENANCE_CONTENT = "temperature2_maintenance_content";
+
+
+ /**
+ * 鎭掓俯涓�缁存姢鍐呭
+ */
+ public static final String TEMPERATURE1_MAINTENANCE_CONTENT = "temperature1_maintenance_content";
+
+ /**
+ * 鍖栧瀹為獙瀹ょ淮鎶ゅ唴瀹�
+ */
+ public static final String CHEMISTRY_MAINTENANCE_CONTENT = "chemistry_maintenance_content";
+
+ /**
+ * 鍒舵牱瀹ょ淮鎶ゅ唴瀹�
+ */
+ public static final String SAMPLE_MAINTENANCE_CONTENT = "sample_maintenance_content";
+
+
+ /**
+ * 浣庢俯瀹為獙瀹ょ淮鎶ゅ唴瀹�
+ */
+ public static final String HYPOTHERMIA_MAINTENANCE_CONTENT = "hypothermia_maintenance_content";
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index f4a7045..13b3568 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -48,7 +48,7 @@
*/
@Autowired
@Qualifier("UserDetailsByOpenIdServiceImpl")
- private UserDetailsService userDetailsServiceByOpenId;
+ private UserDetailsService userDetailsServiceBySSO;
/**
* 璁よ瘉澶辫触澶勭悊绫�
@@ -91,11 +91,11 @@
daoAuthenticationProvider.setPasswordEncoder(bCryptPasswordEncoder());
// sso鐧婚檰閴存潈 Provider
- SsoCodeAuthenticationProvider wxCodeAuthenticationProvider = new SsoCodeAuthenticationProvider();
- wxCodeAuthenticationProvider.setUserDetailsService(userDetailsServiceByOpenId);
+ SsoCodeAuthenticationProvider ssoCodeAuthenticationProvider = new SsoCodeAuthenticationProvider();
+ ssoCodeAuthenticationProvider.setUserDetailsService(userDetailsServiceBySSO);
List<AuthenticationProvider> providers = new ArrayList<>();
- providers.add(wxCodeAuthenticationProvider);
+ providers.add(ssoCodeAuthenticationProvider);
providers.add(daoAuthenticationProvider);
return new ProviderManager(providers);
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/ssoAuth/SsoCodeAuthenticationProvider.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/ssoAuth/SsoCodeAuthenticationProvider.java
index f882b7b..689fe16 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/ssoAuth/SsoCodeAuthenticationProvider.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/ssoAuth/SsoCodeAuthenticationProvider.java
@@ -28,7 +28,7 @@
@Override
public boolean supports(Class<?> authentication) {
- // 鍒ゆ柇 authentication 鏄笉鏄� WxCodeAuthenticationToken 鐨勫瓙绫绘垨瀛愭帴鍙�
+ // 鍒ゆ柇 authentication 鏄笉鏄� SsoCodeAuthenticationToken 鐨勫瓙绫绘垨瀛愭帴鍙�
return SsoCodeAuthenticationToken.class.isAssignableFrom(authentication);
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
index 4a16c32..e3a4e6e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
@@ -91,7 +91,9 @@
name_en,
status
from user u
- where depart_lims_id = (select u2.depart_lims_id
+ where depart_lims_id is not null
+ and depart_lims_id != ''
+ and depart_lims_id = (select u2.depart_lims_id
from user u2
where u2.id = #{userId})
</select>
--
Gitblit v1.9.3