lims-ruoyi-after.git

zhuo

2025-04-23 234b0ac195934b34c06045b2d2ef0f10e239dd8e

系统合并

已修改370个文件

已删除7个文件

已添加24个文件

	README.md	95 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	basic-server/src/main/resources/mapper/StandardTreeMapper.xml	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/controller/DeviceImpowerController.java	108 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/controller/DeviceInstructionController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java	74 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMetricRecordController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/controller/DeviceStateController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/dto/DeviceImpowerDetailsDto.java	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/dto/DeviceImpowerDto.java	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceImpowerDetailsMapper.java	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceImpowerMapper.java	36 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMetricRecordMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMetricsCopyMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceStateMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/mapper/InstructionMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/mapper/OperationInstructionMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceImpower.java	75 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceImpowerDetails.java	61 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceInstruction.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java	75 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceMetricRecord.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceMetricsCopy.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceState.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/pojo/OperationInstruction.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/service/DeviceImpowerDetailsService.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/service/DeviceImpowerService.java	71 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/service/DeviceInstructionService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/service/DeviceMaintenanceService.java	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/service/DeviceMetricRecordService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/service/DeviceMetricsCopyService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/service/DeviceOperationInstructionService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/service/DeviceStateService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceImpowerDetailsServiceImpl.java	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceImpowerServiceImpl.java	299 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceInstructionServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceImpl.java	168 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMetricRecordServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMetricsCopyServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceOperationInstructionServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceStateServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/java/com/ruoyi/device/task/DeviceRecordSchedule.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/resources/mapper/DeviceBorrowMapper.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/resources/mapper/DeviceImpowerDetailsMapper.xml	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/resources/mapper/DeviceImpowerMapper.xml	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/resources/mapper/DeviceMaintenanceMapper.xml	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/resources/mapper/DeviceTraceabilityManagementDetailsMapper.xml	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/resources/static/word/device-impower.docx	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-device/src/main/resources/static/word/device-maintenance.docx	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageControlPlanListController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentAlterController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentCancelController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentControlledController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentListController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingParticipantsController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordAuditController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCheckController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsTotalController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIssueRecycleController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordTotalController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordVerifyController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramFileController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewReportController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRiskAssessmentResultsController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalCorrectFileMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalCorrectMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalMeetingDetailMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalMeetingMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalPlanDetailMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/InternalPlanMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageControlPlanListMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentAlterMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentCancelMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentControlledMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentIssueRecycleMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageDocumentListMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageMeetingMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageMeetingParticipantsMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordAuditMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordCancelMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordCheckMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordIntervalsMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordIntervalsTotalMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordIssueRecycleMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordTotalMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRecordVerifyMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageReviewProgramFileMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageReviewProgramMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageReviewReportMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/mapper/ManageRiskAssessmentResultsMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalCorrect.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalCorrectFile.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalMeeting.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalMeetingDetail.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalPlan.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/InternalPlanDetail.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageControlPlanList.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentAlter.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentCancel.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentControlled.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentIssueRecycle.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageDocumentList.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageMeeting.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageMeetingParticipants.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordAudit.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordCancel.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordCheck.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordIntervals.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordIntervalsTotal.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordIssueRecycle.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordTotal.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRecordVerify.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageReviewProgram.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageReviewProgramFile.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageReviewReport.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageRiskAssessmentResults.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/schedule/ManageRecordTotalSchedule.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/InternalCorrectFileService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/InternalCorrectService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/InternalMeetingDetailService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/InternalMeetingService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/InternalPlanDetailService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/InternalPlanService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/ManageControlPlanListService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentAlterService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentCancelService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentControlledService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentIssueRecycleService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/ManageDocumentListService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/ManageMeetingParticipantsService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/ManageMeetingService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordAuditService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCancelService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCheckService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsTotalService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIssueRecycleService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordTotalService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordVerifyService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/ManageReviewProgramFileService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/ManageReviewProgramService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/ManageReviewReportService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRiskAssessmentResultsService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalCorrectFileServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalCorrectServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalMeetingDetailServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalMeetingServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalPlanDetailServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalPlanServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageControlPlanListServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentAlterServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentCancelServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentControlledServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentIssueRecycleServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentListServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageMeetingParticipantsServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageMeetingServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordAuditServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCancelServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCheckServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsTotalServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIssueRecycleServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordTotalServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordVerifyServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewProgramFileServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewProgramServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewReportServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonCommunicationAbilityController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonJobResponsibilitiesController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPersonnelCapacityController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPostAuthorizationRecordController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonRewardPunishmentRecordController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingRecordController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonCommunicationAbilityMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonJobResponsibilitiesMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonPersonnelCapacityMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonPostAuthorizationRecordMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonRewardPunishmentRecordMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingDetailedMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingRecordMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonCommunicationAbility.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonJobResponsibilities.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonPersonnelCapacity.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonPostAuthorizationRecord.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonRewardPunishmentRecord.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonTraining.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonTrainingDetailed.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonTrainingRecord.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonCommunicationAbilityService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonJobResponsibilitiesService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonPersonnelCapacityService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonPostAuthorizationRecordService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonRewardPunishmentRecordService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingDetailedService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingRecordService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonCommunicationAbilityServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonJobResponsibilitiesServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonPersonnelCapacityServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonPostAuthorizationRecordServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonRewardPunishmentRecordServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingDetailedServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingRecordServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-personnel/src/main/java/com/ruoyi/personnel/task/PersonTrainingSchedule.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/controller/InconsistentDistributionController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/controller/ProcessComplainController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/controller/ProcessDealController.java	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/controller/ProcessEvaluateController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/controller/ProcessOrderDeviceController.java	64 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/controller/ProcessSampleController.java	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotalSampleController.java	59 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotaldealController.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/mapper/InconsistentDistributionDetailMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/mapper/InconsistentDistributionMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/mapper/InspectionOrderMapper.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessComplainMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessDealMapper.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessEvaluateMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessOrderDeviceMapper.java	27 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessReportMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessSampleMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessTotalSampleMapper.java	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessTotaldealMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/pojo/InconsistentDistribution.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/pojo/InconsistentDistributionDetail.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessComplain.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessDeal.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessEvaluate.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessOrderDevice.java	69 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessReport.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessSample.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessTotalSample.java	77 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessTotaldeal.java	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/schedule/ProcessTotaldealSchedule.java	37 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/service/InconsistentDistributionDetailService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/service/InconsistentDistributionService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/service/ProcessComplainService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/service/ProcessDealService.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/service/ProcessEvaluateService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/service/ProcessOrderDeviceService.java	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/service/ProcessReportService.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/service/ProcessSampleService.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/service/ProcessTotalSampleService.java	27 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/service/ProcessTotaldealService.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/service/impl/InconsistentDistributionDetailServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/service/impl/InconsistentDistributionServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java	146 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessComplainServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java	77 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessEvaluateServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessOrderDeviceServiceImpl.java	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessReportServiceImpl.java	375 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessSampleServiceImpl.java	93 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotalSampleServiceImpl.java	437 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java	394 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/task/QualitySuperviseSchedule.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/resources/mapper/InspectionOrderMapper.xml	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/resources/mapper/ProcessDealMapper.xml	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/resources/mapper/ProcessOrderDeviceMapper.xml	52 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/resources/mapper/ProcessReportMapper.xml	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/resources/mapper/ProcessSampleMapper.xml	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/resources/mapper/ProcessTotalSampleMapper.xml	35 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/resources/mapper/ProcessTotaldealMapper.xml	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/resources/static/report-deal.docx	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/resources/static/sample-deal.docx	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/resources/static/sample-receive.docx	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/controller/FeCalibrationScheduleController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/controller/FeIlluminationController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/controller/FeLightningProtectionController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/controller/FePowerStableController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceAcceptanceController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceRecordController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/controller/FeTempHumDateController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/controller/ForeignRegisterController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/controller/InternalWastesController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/controller/ProcurementSuppliesExpendsController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/controller/ProcurementSuppliesListController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/controller/SupplierManagementController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/controller/SuppliersDirectoryContentsController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/mapper/FeCalibrationScheduleMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/mapper/FeIlluminationDetectionAreaMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/mapper/FeIlluminationMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/mapper/FeLightningProtectionMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/mapper/FeMeasuredQuantityMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/mapper/FePowerStableMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/mapper/FeStandardSubstanceAcceptanceInspectionMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/mapper/FeStandardSubstanceAcceptanceMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/mapper/FeStandardSubstanceMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/mapper/FeStandardSubstanceRecordMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/mapper/FeTempHumDateMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/mapper/FeTempHumRecordMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/mapper/ForeignRegisterMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/mapper/InternalWastesDetailMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/mapper/InternalWastesMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/mapper/ProcurementSuppliesExpendsMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/mapper/ProcurementSuppliesListMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/mapper/SupplierManagementMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/mapper/SuppliersDirectoryContentsMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/pojo/FeCalibrationSchedule.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/pojo/FeIllumination.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/pojo/FeIlluminationDetectionArea.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/pojo/FeLightningProtection.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/pojo/FeMeasuredQuantity.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/pojo/FePowerStable.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstance.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceAcceptance.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceAcceptanceInspection.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceRecord.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/pojo/FeTempHumDate.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/pojo/FeTempHumRecord.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/pojo/ForeignRegister.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/pojo/InternalWastes.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/pojo/InternalWastesDetail.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/pojo/ProcurementSuppliesExpends.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/pojo/ProcurementSuppliesList.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/pojo/SupplierManagement.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/pojo/SuppliersDirectoryContents.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/FeCalibrationScheduleService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/FeIlluminationDetectionAreaService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/FeIlluminationService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/FeLightningProtectionService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/FeMeasuredQuantityService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/FePowerStableService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/FeStandardSubstanceAcceptanceInspectionService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/FeStandardSubstanceAcceptanceService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/FeStandardSubstanceRecordService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/FeStandardSubstanceService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/FeTempHumDateService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/FeTempHumRecordService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/ForeignRegisterService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/InternalWastesDetailService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/InternalWastesService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/ProcurementSuppliesExpendsService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/ProcurementSuppliesListService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/SupplierManagementService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/SuppliersDirectoryContentsService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/impl/FeCalibrationScheduleServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/impl/FeIlluminationDetectionAreaServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/impl/FeIlluminationServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/impl/FeLightningProtectionServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/impl/FeMeasuredQuantityServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/impl/FePowerStableServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceAcceptanceInspectionServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceAcceptanceServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceRecordServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/impl/FeTempHumDateServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/impl/FeTempHumRecordServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/impl/ForeignRegisterServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/impl/InternalWastesDetailServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/impl/InternalWastesServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/impl/ProcurementSuppliesExpendsServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/impl/ProcurementSuppliesListServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/impl/SupplierManagementServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/service/impl/SuppliersDirectoryContentsServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-require/src/main/java/com/ruoyi/require/task/FeTempHumDateSchedule.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	inspect-server/src/main/java/com/ruoyi/inspect/controller/InsProductDeviationWarningController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	inspect-server/src/main/java/com/ruoyi/inspect/controller/InsReportController.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	inspect-server/src/main/java/com/ruoyi/inspect/dto/InsReportExport.java	75 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductDeviationWarningDetailMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductDeviationWarningMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsReportMapper.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarning.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarningDetail.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductDeviationWarningDetailService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductDeviationWarningService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductDeviationWarningDetailServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductDeviationWarningServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java	50 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	inspect-server/src/main/resources/mapper/InsOrderMapper.xml	121 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	inspect-server/src/main/resources/mapper/InsProductResultMapper.xml	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	inspect-server/src/main/resources/mapper/InsReportMapper.xml	70 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-common/src/main/java/com/ruoyi/common/constant/DeviceImpowerConstants.java	65 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/ssoAuth/SsoCodeAuthenticationProvider.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/resources/mapper/system/UserMapper.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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ãElement UIã
* åç«¯éç¨Spring BootãSpring SecurityãRedis & 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)ï¼Oracleçæ¬[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)&nbsp;&nbsp;

## åç½®åè½

1.  ç¨æ·ç®¡çï¼ç¨æ·æ¯ç³»ç»æä½èï¼è¯¥åè½ä¸»è¦å®æç³»ç»ç¨æ·éç½®ã
2.  é¨é¨ç®¡çï¼éç½®ç³»ç»ç»ç»æºæï¼å¬å¸ãé¨é¨ãå°ç»ï¼ï¼æ ç»æå±ç°æ¯ææ°æ®æéã
3.  å²ä½ç®¡çï¼éç½®ç³»ç»ç¨æ·æå±æä»»èå¡ã
4.  èåç®¡çï¼éç½®ç³»ç»èåï¼æä½æéï¼æé®æéæ è¯çã
5.  è§è²ç®¡çï¼è§è²èåæéåéãè®¾ç½®è§è²ææºæè¿è¡æ°æ®èå´æéååã
6.  åå¸ç®¡çï¼å¯¹ç³»ç»ä¸ç»å¸¸ä½¿ç¨çä¸äºè¾ä¸ºåºå®çæ°æ®è¿è¡ç»´æ¤ã
7.  åæ°ç®¡çï¼å¯¹ç³»ç»å¨æéç½®å¸¸ç¨åæ°ã
8.  éç¥å¬åï¼ç³»ç»éç¥å¬åä¿¡æ¯åå¸ç»´æ¤ã
9.  æä½æ¥å¿ï¼ç³»ç»æ£å¸¸æä½æ¥å¿è®°å½åæ¥è¯¢ï¼ç³»ç»å¼å¸¸ä¿¡æ¯æ¥å¿è®°å½åæ¥è¯¢ã
10. ç»å½æ¥å¿ï¼ç³»ç»ç»å½æ¥å¿è®°å½æ¥è¯¢åå«ç»å½å¼å¸¸ã
11. å¨çº¿ç¨æ·ï¼å½åç³»ç»ä¸æ´»è·ç¨æ·ç¶æçæ§ã
12. å®æ¶ä»»å¡ï¼å¨çº¿ï¼æ·»å ãä¿®æ¹ãå é¤)ä»»å¡è°åº¦åå«æ§è¡ç»ææ¥å¿ã
13. ä»£ç çæï¼ååç«¯ä»£ç ççæï¼javaãhtmlãxmlãsqlï¼æ¯æCRUDä¸è½½ ã
14. ç³»ç»æ¥å£ï¼æ ¹æ®ä¸å¡ä»£ç èªå¨çæç¸å³çapiæ¥å£ææ¡£ã
15. æå¡çæ§ï¼çè§å½åç³»ç»CPUãååãç£çãå æ çç¸å³ä¿¡æ¯ã
16. ç¼åçæ§ï¼å¯¹ç³»ç»çç¼åä¿¡æ¯æ¥è¯¢ï¼å½ä»¤ç»è®¡çã
17. å¨çº¿æå»ºå¨ï¼æå¨è¡¨ååç´ çæç¸åºçHTMLä»£ç ã
18. è¿æ¥æ± çè§ï¼çè§å½åç³»ç»æ°æ®åºè¿æ¥æ± ç¶æï¼å¯è¿è¡åæSQLæ¾åºç³»ç»æ§è½ç¶é¢ã

## å¨çº¿ä½éª

- admin/admin123  
- ééç»ç»æ¶å°ä¸äºæèµï¼ä¸ºäºæ´å¥½çä½éªå·²ç¨äºæ¼ç¤ºæå¡å¨åçº§ãè°¢è°¢åä½å°ä¼ä¼´ã

æ¼ç¤ºå°åï¼http://vue.ruoyi.vip  
ææ¡£å°åï¼http://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ç¾¤ï¼ [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-101456076-blue.svg)](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-101539465-blue.svg)](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-264312783-blue.svg)](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-167385320-blue.svg)](https://jq.qq.com/?_wv=1027&k=SWCtLnMz) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-104748341-blue.svg)](https://jq.qq.com/?_wv=1027&k=96Dkdq0k) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-160110482-blue.svg)](https://jq.qq.com/?_wv=1027&k=0fsNiYZt) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-170801498-blue.svg)](https://jq.qq.com/?_wv=1027&k=7xw4xUG1) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-108482800-blue.svg)](https://jq.qq.com/?_wv=1027&k=eCx8eyoJ) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-101046199-blue.svg)](https://jq.qq.com/?_wv=1027&k=SpyH2875) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-136919097-blue.svg)](https://jq.qq.com/?_wv=1027&k=tKEt51dz) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-143961921-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=0vBbSb0ztbBgVtn3kJS-Q4HUNYwip89G&authKey=8irq5PhutrZmWIvsUsklBxhj57l%2F1nOZqjzigkXZVoZE451GG4JHPOqW7AW6cf0T&noverify=0&group_code=143961921) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-174951577-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=ZFAPAbp09S2ltvwrJzp7wGlbopsc0rwi&authKey=HB2cxpxP2yspk%2Bo3WKTBfktRCccVkU26cgi5B16u0KcAYrVu7sBaE7XSEqmMdFQp&noverify=0&group_code=174951577) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-161281055-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=Fn2aF5IHpwsy8j6VlalNJK6qbwFLFHat&authKey=uyIT%2B97x2AXj3odyXpsSpVaPMC%2Bidw0LxG5MAtEqlrcBcWJUA%2FeS43rsF1Tg7IRJ&noverify=0&group_code=161281055) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-138988063-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=XIzkm_mV2xTsUtFxo63bmicYoDBA6Ifm&authKey=dDW%2F4qsmw3x9govoZY9w%2FoWAoC4wbHqGal%2BbqLzoS6VBarU8EBptIgPKN%2FviyC8j&noverify=0&group_code=138988063) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-151450850-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=DkugnCg68PevlycJSKSwjhFqfIgrWWwR&authKey=pR1Pa5lPIeGF%2FFtIk6d%2FGB5qFi0EdvyErtpQXULzo03zbhopBHLWcuqdpwY241R%2F&noverify=0&group_code=151450850) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-224622315-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=F58bgRa-Dp-rsQJThiJqIYv8t4-lWfXh&authKey=UmUs4CVG5OPA1whvsa4uSespOvyd8%2FAr9olEGaWAfdLmfKQk%2FVBp2YU3u2xXXt76&noverify=0&group_code=224622315) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-287842588-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=Nxb2EQ5qozWa218Wbs7zgBnjLSNk_tVT&authKey=obBKXj6SBKgrFTJZx0AqQnIYbNOvBB2kmgwWvGhzxR67RoRr84%2Bus5OadzMcdJl5&noverify=0&group_code=287842588) [![å å¥QQç¾¤](https://img.shields.io/badge/187944233-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=numtK1M_I4eVd2Gvg8qtbuL8JgX42qNh&authKey=giV9XWMaFZTY%2FqPlmWbkB9g3fi0Ev5CwEtT9Tgei0oUlFFCQLDp4ozWRiVIzubIm&noverify=0&group_code=187944233) ç¹å»æé®å¥ç¾¤ã

 basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java

@@ -121,4 +121,7 @@

    @ApiModelProperty("åæ£")
    private Integer isExemption;

    @ApiModelProperty("åææid(å¯¼åºç¨)")
    private String ids;
}

 basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java

@@ -94,6 +94,14 @@
     * @return
     */
    List<SampleDto> getStandardTree3(@Param("sampleType") String sampleType);

    /**
     * æ ¹æ®åææidåè¡¨æ¥è¯¢åææä¿¡æ¯
     * @param ifsIds
     * @return
     */
    List<IfsInventoryQuantitySupplierDto> getIfsByIds(@Param("ifsIds") List<String> ifsIds);

}



 basic-server/src/main/resources/mapper/StandardTreeMapper.xml

@@ -389,4 +389,13 @@
        where sample_type = #{sampleType}
          and sample is null
    </select>

    <!-- æ ¹æ®åææidåè¡¨æ¥è¯¢åææä¿¡æ¯ -->
    <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>

 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);
    }

}

 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

 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);
    }

}

 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 = "è®¾å¤ - è®¾å¤æ ¡å")

 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

 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;
}

 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;
}

 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;

}

 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);
}

 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);
}

 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);

}

 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> {

 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> {

 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> {

 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> {

 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> {

 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("ç¼å¶äººid")
    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("åå»ºäººid")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    @ApiModelProperty("åå»ºæ¥æ")
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @ApiModelProperty("ä¿®æ¹äººid")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    @ApiModelProperty("ä¿®æ¹æ¶é´")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;
}

 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("è®¾å¤éå¼æº¯æºè®¡åè¯¦æid")
    @TableId(value = "impower_detail_id", type = IdType.AUTO)
    private Integer impowerDetailId;

    @ApiModelProperty("è®¾å¤éå¼æº¯æºè®¡åid")
    private Integer impowerId;

    @ApiModelProperty("è®¾å¤id")
    private Integer deviceId;

    @ApiModelProperty("æ£æµé¡¹ç®")
    private String inspectionItem;

    @ApiModelProperty("è¢«ææäºº")
    private String delegatedUser;

    @ApiModelProperty("åå»ºäººid")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    @ApiModelProperty("åå»ºæ¥æ")
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @ApiModelProperty("ä¿®æ¹äººid")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    @ApiModelProperty("ä¿®æ¹æ¶é´")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;
}

 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

 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("ç»´æ¤äººid")
    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("åå»ºäººid")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    @ApiModelProperty("æ´æ°æ¶é´")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    @ApiModelProperty("æ´æ°äººid")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    @TableField(select = false, exist = false)
    @ApiModelProperty("ç»´æ¤äººå¾ç")
    private PictureRenderData maintenanceUserUrlRender;


}


 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

 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

 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

 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

 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> {

}

 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);
}

 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> {

 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è®¾å¤ç»´æ¤è®°å½
     *
 * è®¾å¤ç»´æ¤ä¿å»
 */
public interface DeviceMaintenanceService extends IService<DeviceMaintenance> {

    /**
     * è®¾å¤ç»´æ¤åé¡µæ¥è¯¢
     * @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);
}

 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> {

 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> {

 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> {

 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> {

 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 {

}

 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());

        // æ¥è¯¢å®¡æ ¸äººid
        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) {
        // æ¥è¯¢å®¡æ ¸äººid
        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();
    }
}

 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

 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(), ',');
                // å¾ªç¯å¤ææ¯å¦æä¸æ ·key
                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;
    }
}

 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

 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

 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

 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);

 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

 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();

 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>

 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>

 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>

 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>

 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

 cnas-device/src/main/resources/static/word/device-impower.docx

Binary files differ

 cnas-device/src/main/resources/static/word/device-maintenance.docx

Binary files differ

 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 = "åå®¡çº æ£æªæ½")

 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 = "åå®¡ä¼è®®")

 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 = "åå®¡å¹´åº¦è®¡å")

 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 = "éå¤§é£é©å ç´ åæåæ§å¶è®¡åæ¸å")

 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 = "ç®¡çä½ç³»æä»¶çæ§å¶")

 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 = "ç®¡çä½ç³»æä»¶çæ§å¶")

 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 = "ç®¡çä½ç³»æä»¶çæ§å¶")

 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 = "ç®¡çä½ç³»æä»¶çæ§å¶")

 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 = "ç®¡çä½ç³»æä»¶çæ§å¶")

 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 = "ç®¡çè¯å®¡ä¼è®®")

 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 = "ç®¡çè¯å®¡ä¼è®®")

 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 = "è®°å½çæ§å¶")

 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 = "è®°å½çæ§å¶")

 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 = "è®°å½çæ§å¶")

 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 = "è®°å½çæ§å¶")

 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 = "è®°å½çæ§å¶")

 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 = "è®°å½çæ§å¶")

 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 = "è®°å½çæ§å¶")

 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 = "è®°å½çæ§å¶")

 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 = "ç®¡çè¯å®¡è®¡å")

 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 = "ç®¡çè¯å®¡è®¡åæä»¶")

 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 = "ç®¡çè¯å®¡æ¥å")

 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 = "å±é©å ç´ è¾¨è¯ä¸é£é©è¯ä»·ç»æä¸è§è¡¨")

 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

 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

 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> {

 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> {

 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

 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

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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");

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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 = "äººå - æ²éè®°å½")

 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 = "äººå - å²ä½èè´£")

 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 = "äººå - äººåè½å")

 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 = "äººå - ä»»èææè®°å½")

 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 = "äººå - å¥æ©è®°å½")

 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 = "äººå - å¹è®è®¡å")

 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 = "äººå - å¹è®è®°å½")

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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

 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

 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

 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

 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

 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

 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

 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

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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

 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

 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

 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

 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

 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

 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)

 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

 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");

 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 = "ä¸ç¬¦åé¡¹çåå¸")

 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

 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)));
    }

}

 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

 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);
    }
}

 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);
    }

}

 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);
    }



 cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotalSampleController.java

ÎÄ¼þÒÑÉ¾³ý

 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);
    }


}

 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

 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

 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);

}

 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> {

 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);

}

 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> {

 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);
}

 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> {

 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> {

 cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessTotalSampleMapper.java

ÎÄ¼þÒÑÉ¾³ý

 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> {

 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
 */


 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

 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

 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("å³èçæ ·åæ¥æ¶id")
    private Integer processSampleId;

    @ApiModelProperty("åºå·")
    @TableField(select = false,exist = false)
    private String indexs;
}

 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

 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("å§æåid")
    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("ä½¿ç¨äººid")
    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;
}

 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("å§æåid")
    private Integer inspectionOrderId;
}

 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("å§æåid")
    private Integer inspectionOrderId;

    @ApiModelProperty("æ¶æ ·æ¥æ")
    @JsonFormat(pattern = "yyyy-MM-dd")

 cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessTotalSample.java

ÎÄ¼þÒÑÉ¾³ý

 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("å®¡æ ¸äººçµåç¾åurl")
    private String examineUrl;


    @TableField(select = false, exist = false)
    private String examineUserName;

@@ -49,9 +45,6 @@

    @ApiModelProperty("æ¹åç»æ")
    private String ratifyState;

    @ApiModelProperty("æ¹åäººçµåç¾åurl")
    private String ratifyUrl;

    @TableField(select = false, exist = false)
    private String ratifyUserName;
@@ -64,15 +57,7 @@
    @ApiModelProperty("æäº¤ç»æ")
    private String submitState;

    @ApiModelProperty("æäº¤äººçµåç¾åurl")
    private String submitUrl;

    @ApiModelProperty("æ»æ°é")
    private Integer totalNum;

    @ApiModelProperty("æä»½")
    private String month;

    @ApiModelProperty("çæç³è¯·è¡¨çè·¯å¾")
    private String url;
}

 cnas-process/src/main/java/com/ruoyi/process/schedule/ProcessTotaldealSchedule.java

ÎÄ¼þÒÑÉ¾³ý

 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> {

 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> {

 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> {

 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);
}

 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> {

 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);
}

 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);
}

 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);
}

 cnas-process/src/main/java/com/ruoyi/process/service/ProcessTotalSampleService.java

ÎÄ¼þÒÑÉ¾³ý

 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);
}

 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

 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

 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());//å§æåid
                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);//ä½¿ç¨äººid
                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;
    }


 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

 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);
    }
}

 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

 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);
    }
}

 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 {
//        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");
            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(
        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;
    }
}

 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);
    }
}

 cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotalSampleServiceImpl.java

ÎÄ¼þÒÑÉ¾³ý

 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);
    }

    //çææ ·åå¤çè¡¨word
    private String processTotaldeal(Integer id, String signatureUrl) {
        List<ProcessDeal> processDeals = processDealMapper.selectList(Wrappers.<ProcessDeal>lambdaQuery().eq(ProcessDeal::getTotaldealId, id));
        String url;
        try {
    @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);
        }
        //æ°å¢è¯¦æè¡¨
        //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;
                }
                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);
        }
        return 0;
    }

    @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");
            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 < 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);
                    }
                }
                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(
        Configure configure = Configure.builder()
                .bind("sampleList", new HackLoopTableRenderPolicy())
                .build();
        XWPFTemplate template = XWPFTemplate.compile(inputStream, configure).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));
                    put("sampleList", sampleDealDtos);
                    put("writeUrl",UserUtils.getFinalUserSignatureUrl(processTotaldeal.getSubmitUser()));//æäº¤äºº
                    put("examineUrl", UserUtils.getFinalUserSignatureUrl(processTotaldeal.getExamineUser()));//å®¡æ ¸äºº
                    put("ratifyUrl", UserUtils.getFinalUserSignatureUrl(processTotaldeal.getRatifyUser()));//æ¹åäºº
                }});
        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;
    }

    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;
    }
}

 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");

 cnas-process/src/main/resources/mapper/InspectionOrderMapper.xml

@@ -24,5 +24,4 @@
            ${ew.customSqlSegment}
        </if>
    </select>

</mapper>

 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>

 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>

 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

 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" />

 cnas-process/src/main/resources/mapper/ProcessTotalSampleMapper.xml

ÎÄ¼þÒÑÉ¾³ý

 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 *

 cnas-process/src/main/resources/static/report-deal.docx

Binary files differ

 cnas-process/src/main/resources/static/sample-deal.docx

Binary files differ

 cnas-process/src/main/resources/static/sample-receive.docx

Binary files differ

 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 = "éå¼æº¯æºè®¡å")

 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

 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 = "è®¾æ½åç¯å¢æ¡ä»¶è¦æ±-é²é·æ£æµ")

 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 = "è®¾æ½åç¯å¢æ¡ä»¶-è®¾æ½åç¯å¢æ¡ä»¶è¦æ±-çµæºç¨³å®æ§")

 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 = "æ åç©è´¨éªæ¶")

 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 = "æ åç©è´¨æ¸å")

 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 = "æ åç©è´¨æ¸ååç¨å½è¿è®°å½")

 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 = "æ¸©æ¹¿åº¦è®°å½")

 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 = "å¤æ¥äººåç»è®°")

 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 = "å®å¨åå¡ä¸åºç»è®°")

 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 = "æå¡åä¾åºåéè´èææ¶è")

 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 = "æå¡åä¾åºåéè´èæ")

 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 = "ä¾åºåç®¡ç")

 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 = "ä¾åºåç®¡çæ ")

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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

 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> {

 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

 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

 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> {

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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> {

 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

 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

 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

 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

 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

 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

 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

 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

 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)

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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());

 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

 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);
    }
}

 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;
}

 inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java

@@ -92,7 +92,8 @@
    @ApiModelProperty("æ»ä»·")
    private String totalPrice;


    @ApiModelProperty("è®¢åid(å¯¼åºç¨)")
    private String ids;


}

 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);
}

 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> {

 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> {

 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);
}



 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

 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

 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> {

 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> {

 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;
}

 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);
            });



 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java

@@ -992,8 +992,11 @@
     */
    @Override
    public void rawAllInsOrderExport(SampleOrderDto sampleOrderDto, HttpServletResponse response) {
        //å¤æå¨é¨,ä¸ªäºº,ç»ç»çæé
        //todo:ä»çæè·åå½åäººæå±å®éªå®¤id
        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;
@@ -1001,7 +1004,9 @@
            isOrderAll = "1";
            sampleOrderDto.setState(null);
        }
        List<SampleOrderDto> sampleOrderDtoList = insOrderMapper.rawAllInsOrderExport(QueryWrappers.queryWrappers(sampleOrderDto), laboratory, isOrderAll);
            sampleOrderDto.setIds(null);
            sampleOrderDtoList = insOrderMapper.rawAllInsOrderExport(QueryWrappers.queryWrappers(sampleOrderDto), laboratory, isOrderAll);
        }

        // å¤ææ¯å¦æ¯ä¸åæ ¼, ä¸åæ ¼æ¥è¯¢ä¸åæ ¼é¡¹
        for (SampleOrderDto orderDto : sampleOrderDtoList) {

 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

 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

 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å¯ä»¥é²æ¢ä¸æä¹±ç  å½ç¶åeasyexcelæ²¡æå³ç³»
        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();

            //åsheet0åå¥æ°æ® ä¼ å¥ç©ºlistè¿æ ·åªå¯¼åºè¡¨å¤´
            excelWriter.write(insReportExports, mainSheet);
            //å³éæµ
            excelWriter.finish();
        } catch (IOException e) {
            throw new RuntimeException("å¯¼åºå¤±è´¥");
        }


    }


    /**
     * åä¿®æ¹éè´è®¢åæ¹æ¬¡å·, åè¿è¡ç§»åºæä½

 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 {
        //æ¥è¯¢å¯¼åºçè´¹ç¨ç»è®¡æ°æ®
        // å¤ææ¯å¦æ¯æ ¹æ®éæ©çå¯¼åº
        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);
        List<IfsInventoryQuantitySupplierDto> ifsByOverList = standardTreeMapper.getIfsByOverList(QueryWrappers.queryWrappers(ifsInventoryQuantityDto), beginDeclareDate, endDeclareDate);
            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")));

 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>

 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

 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>

 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";
}

 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);

 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);
    }


 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>

			@@ -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ãElement UIã
			* åç«¯éç¨Spring BootãSpring SecurityãRedis & 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)ï¼Oracleçæ¬[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ãhtmlãxmlãsqlï¼æ¯æCRUDä¸è½½ ã
			14. ç³»ç»æ¥å£ï¼æ ¹æ®ä¸å¡ä»£ç èªå¨çæç¸å³çapiæ¥å£ææ¡£ã
			15. æå¡çæ§ï¼çè§å½åç³»ç»CPUãååãç£çãå æ çç¸å³ä¿¡æ¯ã
			16. ç¼åçæ§ï¼å¯¹ç³»ç»çç¼åä¿¡æ¯æ¥è¯¢ï¼å½ä»¤ç»è®¡çã
			17. å¨çº¿æå»ºå¨ï¼æå¨è¡¨ååç´ çæç¸åºçHTMLä»£ç ã
			18. è¿æ¥æ± çè§ï¼çè§å½åç³»ç»æ°æ®åºè¿æ¥æ± ç¶æï¼å¯è¿è¡åæSQLæ¾åºç³»ç»æ§è½ç¶é¢ã

			## å¨çº¿ä½éª

			- admin/admin123
			- ééç»ç»æ¶å°ä¸äºæèµï¼ä¸ºäºæ´å¥½çä½éªå·²ç¨äºæ¼ç¤ºæå¡å¨åçº§ãè°¢è°¢åä½å°ä¼ä¼´ã

			æ¼ç¤ºå°åï¼http://vue.ruoyi.vip
			ææ¡£å°åï¼http://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ç¾¤ï¼ [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-101456076-blue.svg)](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-101539465-blue.svg)](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-264312783-blue.svg)](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-167385320-blue.svg)](https://jq.qq.com/?_wv=1027&k=SWCtLnMz) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-104748341-blue.svg)](https://jq.qq.com/?_wv=1027&k=96Dkdq0k) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-160110482-blue.svg)](https://jq.qq.com/?_wv=1027&k=0fsNiYZt) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-170801498-blue.svg)](https://jq.qq.com/?_wv=1027&k=7xw4xUG1) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-108482800-blue.svg)](https://jq.qq.com/?_wv=1027&k=eCx8eyoJ) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-101046199-blue.svg)](https://jq.qq.com/?_wv=1027&k=SpyH2875) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-136919097-blue.svg)](https://jq.qq.com/?_wv=1027&k=tKEt51dz) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-143961921-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=0vBbSb0ztbBgVtn3kJS-Q4HUNYwip89G&authKey=8irq5PhutrZmWIvsUsklBxhj57l%2F1nOZqjzigkXZVoZE451GG4JHPOqW7AW6cf0T&noverify=0&group_code=143961921) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-174951577-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=ZFAPAbp09S2ltvwrJzp7wGlbopsc0rwi&authKey=HB2cxpxP2yspk%2Bo3WKTBfktRCccVkU26cgi5B16u0KcAYrVu7sBaE7XSEqmMdFQp&noverify=0&group_code=174951577) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-161281055-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=Fn2aF5IHpwsy8j6VlalNJK6qbwFLFHat&authKey=uyIT%2B97x2AXj3odyXpsSpVaPMC%2Bidw0LxG5MAtEqlrcBcWJUA%2FeS43rsF1Tg7IRJ&noverify=0&group_code=161281055) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-138988063-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=XIzkm_mV2xTsUtFxo63bmicYoDBA6Ifm&authKey=dDW%2F4qsmw3x9govoZY9w%2FoWAoC4wbHqGal%2BbqLzoS6VBarU8EBptIgPKN%2FviyC8j&noverify=0&group_code=138988063) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-151450850-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=DkugnCg68PevlycJSKSwjhFqfIgrWWwR&authKey=pR1Pa5lPIeGF%2FFtIk6d%2FGB5qFi0EdvyErtpQXULzo03zbhopBHLWcuqdpwY241R%2F&noverify=0&group_code=151450850) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-224622315-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=F58bgRa-Dp-rsQJThiJqIYv8t4-lWfXh&authKey=UmUs4CVG5OPA1whvsa4uSespOvyd8%2FAr9olEGaWAfdLmfKQk%2FVBp2YU3u2xXXt76&noverify=0&group_code=224622315) [![å å¥QQç¾¤](https://img.shields.io/badge/å·²æ»¡-287842588-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=Nxb2EQ5qozWa218Wbs7zgBnjLSNk_tVT&authKey=obBKXj6SBKgrFTJZx0AqQnIYbNOvBB2kmgwWvGhzxR67RoRr84%2Bus5OadzMcdJl5&noverify=0&group_code=287842588) [![å å¥QQç¾¤](https://img.shields.io/badge/187944233-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=numtK1M_I4eVd2Gvg8qtbuL8JgX42qNh&authKey=giV9XWMaFZTY%2FqPlmWbkB9g3fi0Ev5CwEtT9Tgei0oUlFFCQLDp4ozWRiVIzubIm&noverify=0&group_code=187944233) ç¹å»æé®å¥ç¾¤ã

			@@ -121,4 +121,7 @@

			@ApiModelProperty("åæ£")
			private Integer isExemption;

			@ApiModelProperty("åææid(å¯¼åºç¨)")
			private String ids;
			}

			@@ -94,6 +94,14 @@
			* @return
			*/
			List<SampleDto> getStandardTree3(@Param("sampleType") String sampleType);

			/**
			* æ ¹æ®åææidåè¡¨æ¥è¯¢åææä¿¡æ¯
			* @param ifsIds
			* @return
			*/
			List<IfsInventoryQuantitySupplierDto> getIfsByIds(@Param("ifsIds") List<String> ifsIds);

			}

			@@ -389,4 +389,13 @@
			where sample_type = #{sampleType}
			and sample is null
			</select>

			<!-- æ ¹æ®åææidåè¡¨æ¥è¯¢åææä¿¡æ¯ -->
			<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>

¶Ô±ÈÐÂÎÄ¼þ
			@@ -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);
			}

			}

			@@ -27,7 +27,7 @@
			* ä½ä¸æå¯¼ä¹¦æ·»å åæ§æä»¶è¡¨ åç«¯æ§å¶å¨
			* </p>
			*
			* @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå¬å¸
			* @author
			* @since 2024-12-04 10:29:18
			*/
			@RestController

			@@ -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);
			}

			}

			@@ -26,7 +26,7 @@
			* è®¾å¤æ ¡å - æ ¡åè®°å½ åç«¯æ§å¶å¨
			* </p>
			*
			* @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå¬å¸
			* @author
			* @since 2024-09-27 10:20:01
			*/
			@Api(tags = "è®¾å¤ - è®¾å¤æ ¡å")

			@@ -28,7 +28,7 @@
			* è®¾å¤åç¨/å¯ç¨ åç«¯æ§å¶å¨
			* </p>
			*
			* @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå¬å¸
			* @author
			* @since 2024-09-26 09:51:40
			*/
			@RestController

¶Ô±ÈÐÂÎÄ¼þ
			@@ -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;
			}

¶Ô±ÈÐÂÎÄ¼þ
			@@ -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;
			}

¶Ô±ÈÐÂÎÄ¼þ
			@@ -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;

			}

¶Ô±ÈÐÂÎÄ¼þ
			@@ -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);
			}

¶Ô±ÈÐÂÎÄ¼þ
			@@ -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);
			}

			@@ -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);

			}

			@@ -8,7 +8,7 @@
			* è®¾å¤æ ¡å - æ ¡åè®°å½ Mapper æ¥å£
			* </p>
			*
			* @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå¬å¸
			* @author
			* @since 2024-09-27 10:20:01
			*/
			public interface DeviceMetricRecordMapper extends BaseMapper<DeviceMetricRecord> {

			@@ -8,7 +8,7 @@
			* è®¾å¤æ ¡å - æ ¡åè®°å½ - æ ¡åæ¡ç® Mapper æ¥å£
			* </p>
			*
			* @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå¬å¸
			* @author
			* @since 2024-09-27 10:20:11
			*/
			public interface DeviceMetricsCopyMapper extends BaseMapper<DeviceMetricsCopy> {

			@@ -12,7 +12,7 @@
			* è®¾å¤åç¨/å¯ç¨ Mapper æ¥å£
			* </p>
			*
			* @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå¬å¸
			* @author
			* @since 2024-09-26 09:51:40
			*/
			public interface DeviceStateMapper extends BaseMapper<DeviceState> {

			@@ -15,7 +15,7 @@
			* ä½ä¸æå¯¼ä¹¦æ·»å åæ§æä»¶è¡¨ Mapper æ¥å£
			* </p>
			*
			* @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå¬å¸
			* @author
			* @since 2024-12-04 10:29:18
			*/
			public interface InstructionMapper extends BaseMapper<DeviceInstruction> {

			@@ -11,7 +11,7 @@
			* è®¾å¤ - ä½ä¸æå¯¼ä¹¦ æ·»å åæ§æä»¶ å Mapper æ¥å£
			* </p>
			*
			* @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå¬å¸
			* @author
			* @since 2024-12-04 10:43:32
			*/
			public interface OperationInstructionMapper extends BaseMapper<OperationInstruction> {

¶Ô±ÈÐÂÎÄ¼þ
			@@ -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("ç¼å¶äººid")
			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("åå»ºäººid")
			@TableField(fill = FieldFill.INSERT)
			private Integer createUser;

			@ApiModelProperty("åå»ºæ¥æ")
			@TableField(fill = FieldFill.INSERT)
			private LocalDateTime createTime;

			@ApiModelProperty("ä¿®æ¹äººid")
			@TableField(fill = FieldFill.INSERT_UPDATE)
			private Integer updateUser;

			@ApiModelProperty("ä¿®æ¹æ¶é´")
			@TableField(fill = FieldFill.INSERT_UPDATE)
			private LocalDateTime updateTime;
			}

¶Ô±ÈÐÂÎÄ¼þ
			@@ -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("è®¾å¤éå¼æº¯æºè®¡åè¯¦æid")
			@TableId(value = "impower_detail_id", type = IdType.AUTO)
			private Integer impowerDetailId;

			@ApiModelProperty("è®¾å¤éå¼æº¯æºè®¡åid")
			private Integer impowerId;

			@ApiModelProperty("è®¾å¤id")
			private Integer deviceId;

			@ApiModelProperty("æ£æµé¡¹ç®")
			private String inspectionItem;

			@ApiModelProperty("è¢«ææäºº")
			private String delegatedUser;

			@ApiModelProperty("åå»ºäººid")
			@TableField(fill = FieldFill.INSERT)
			private Integer createUser;

			@ApiModelProperty("åå»ºæ¥æ")
			@TableField(fill = FieldFill.INSERT)
			private LocalDateTime createTime;

			@ApiModelProperty("ä¿®æ¹äººid")
			@TableField(fill = FieldFill.INSERT_UPDATE)
			private Integer updateUser;

			@ApiModelProperty("ä¿®æ¹æ¶é´")
			@TableField(fill = FieldFill.INSERT_UPDATE)
			private LocalDateTime updateTime;
			}

			@@ -14,7 +14,7 @@
			* ä½ä¸æå¯¼ä¹¦æ·»å åæ§æä»¶è¡¨
			* </p>
			*
			* @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå¬å¸
			* @author
			* @since 2024-12-04 10:29:18
			*/
			@Getter

			@@ -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("ç»´æ¤äººid")
			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("åå»ºäººid")
			@TableField(fill = FieldFill.INSERT)
			private Integer createUser;

			@ApiModelProperty("æ´æ°æ¶é´")
			@TableField(fill = FieldFill.INSERT_UPDATE)
			private LocalDateTime updateTime;

			@ApiModelProperty("æ´æ°äººid")
			@TableField(fill = FieldFill.INSERT_UPDATE)
			private Integer updateUser;

			@TableField(select = false, exist = false)
			@ApiModelProperty("ç»´æ¤äººå¾ç")
			private PictureRenderData maintenanceUserUrlRender;


			}

			@@ -16,7 +16,7 @@
			* è®¾å¤æ ¡å - æ ¡åè®°å½
			* </p>
			*
			* @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå¬å¸
			* @author
			* @since 2024-09-27 10:20:01
			*/
			@Getter

			@@ -16,7 +16,7 @@
			* è®¾å¤æ ¡å - æ ¡åè®°å½ - æ ¡åæ¡ç®
			* </p>
			*
			* @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå¬å¸
			* @author
			* @since 2024-09-27 10:20:11
			*/
			@Getter

			@@ -15,7 +15,7 @@
			* è®¾å¤åç¨/å¯ç¨
			* </p>
			*
			* @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå¬å¸
			* @author
			* @since 2024-09-26 09:51:40
			*/
			@Getter

			@@ -14,7 +14,7 @@
			* è®¾å¤ - ä½ä¸æå¯¼ä¹¦ æ·»å åæ§æä»¶ å
			* </p>
			*
			* @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå¬å¸
			* @author
			* @since 2024-12-04 10:43:32
			*/
			@Getter

¶Ô±ÈÐÂÎÄ¼þ
			@@ -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> {

			}

¶Ô±ÈÐÂÎÄ¼þ
			@@ -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);
			}