From bfbda05bdcb05e5c4457af92d79b2a0185af2b4f Mon Sep 17 00:00:00 2001 From: mythxb Date: Mon, 1 Apr 2024 16:01:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E6=94=BF=E5=90=8C=E8=B4=A3=E8=80=83?= =?UTF-8?q?=E6=A0=B8=E9=A1=B9=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/rzyc/bean/bigdata/wx/WxCheckInfo.java | 2 +- .../com/rzyc/bean/bigdata/wx/WxDutyNet.java | 2 +- .../com/rzyc/bean/ex/ExamineChangeDto.java | 63 ++++ .../com/rzyc/bean/ex/ItemAddBonusDto.java | 64 ++++ .../java/com/rzyc/bean/ex/ItemAddDto.java | 142 +++++++++ .../com/rzyc/bean/ex/ItemAddSpecificDto.java | 89 ++++++ .../java/com/rzyc/bean/ex/UnitListDto.java | 28 ++ .../java/com/rzyc/bean/file/FileResult.java | 2 +- .../java/com/rzyc/bean/file/FileResults.java | 2 +- .../main/java/com/rzyc/enums/ExItemType.java | 31 ++ .../java/com/rzyc/enums/ExamineState.java | 30 ++ .../{ => ent}/EntCertificatesMapper.java | 4 +- .../{ => ent}/EntDeviceInsCycleMapper.java | 9 +- .../EntDeviceMaintenancePlanMapper.java | 6 +- .../EntDeviceMaintenanceRecordMapper.java | 6 +- .../mapper/{ => ent}/EntDeviceMapper.java | 8 +- .../mapper/{ => ent}/EntDeviceTypeMapper.java | 6 +- .../{ => ent}/EntEmEquipmentMapper.java | 6 +- .../mapper/{ => ent}/EntEmExpertMapper.java | 6 +- .../{ => ent}/EntEmRehearsalMapper.java | 6 +- .../{ => ent}/EntEmReservePlanMapper.java | 7 +- .../mapper/{ => ent}/EntInsRecordMapper.java | 6 +- .../{ => ent}/EntInspectionRecordMapper.java | 6 +- .../EntOperatingInstructionMapper.java | 6 +- .../mapper/{ => ent}/EntPostDutyMapper.java | 6 +- .../{ => ent}/EntPostListDetailMapper.java | 6 +- .../mapper/{ => ent}/EntPostListMapper.java | 7 +- .../mapper/{ => ent}/EntPostTaskMapper.java | 6 +- .../mapper/{ => ent}/EntRepairPlanMapper.java | 6 +- .../{ => ent}/EntRepairRecordMapper.java | 6 +- .../{ => ent}/EntReportRepairMapper.java | 6 +- .../{ => ent}/EntUserCredentialMapper.java | 7 +- .../mapper/{ => ent}/EntUserTypeMapper.java | 6 +- .../rzyc/mapper/ent/SysEnterpriseMapper.java | 2 - .../rzyc/mapper/ex/ExExamineItemMapper.java | 16 + .../com/rzyc/mapper/ex/ExExamineMapper.java | 26 ++ .../com/rzyc/mapper/ex/ExStandardMapper.java | 16 + .../rzyc/mapper/{ => sys}/SysCodeMapper.java | 6 +- .../{ => sys}/SysDocumenttempMapper.java | 4 +- .../mapper/{ => sys}/SysLogAuthMapper.java | 6 +- .../mapper/{ => sys}/SysLogOptMapper.java | 8 +- .../rzyc/mapper/{ => sys}/SysOrgMapper.java | 7 +- .../rzyc/mapper/{ => sys}/SysRoleMapper.java | 6 +- .../{ => sys}/SysRoleResourceMapper.java | 6 +- .../{ => sys}/SysStatuteDescMapper.java | 6 +- .../mapper/{ => sys}/SysStatuteMapper.java | 6 +- .../mapper/{ => sys}/SysUnitTradeMapper.java | 4 +- .../mapper/{ => sys}/SysWarningMapper.java | 4 +- .../{ => sys}/SysWarningTypeMapper.java | 5 +- .../{ => sys}/SysWarningUserMapper.java | 4 +- .../mapper/{ => sys}/SysdocumentMapper.java | 6 +- .../rzyc/mapper/user/ListPerformMapper.java | 3 + .../rzyc/model/{ => ent}/EntCertificates.java | 2 +- .../com/rzyc/model/{ => ent}/EntDevice.java | 3 +- .../model/{ => ent}/EntDeviceInsCycle.java | 6 +- .../{ => ent}/EntDeviceInsStatistic.java | 4 +- .../{ => ent}/EntDeviceMaintenancePlan.java | 6 +- .../{ => ent}/EntDeviceMaintenanceRecord.java | 6 +- .../rzyc/model/{ => ent}/EntDeviceType.java | 4 +- .../rzyc/model/{ => ent}/EntEmEquipment.java | 4 +- .../com/rzyc/model/{ => ent}/EntEmExpert.java | 4 +- .../rzyc/model/{ => ent}/EntEmRehearsal.java | 4 +- .../model/{ => ent}/EntEmReservePlan.java | 4 +- .../rzyc/model/{ => ent}/EntInsRecord.java | 7 +- .../model/{ => ent}/EntInspectionRecord.java | 4 +- .../{ => ent}/EntOperatingInstruction.java | 4 +- .../com/rzyc/model/{ => ent}/EntPostDuty.java | 4 +- .../com/rzyc/model/{ => ent}/EntPostList.java | 4 +- .../model/{ => ent}/EntPostListDetail.java | 4 +- .../com/rzyc/model/{ => ent}/EntPostTask.java | 6 +- .../model/{ => ent}/EntPostTaskStatistic.java | 2 +- .../rzyc/model/{ => ent}/EntRepairPlan.java | 6 +- .../rzyc/model/{ => ent}/EntRepairRecord.java | 7 +- .../rzyc/model/{ => ent}/EntReportRepair.java | 6 +- .../model/{ => ent}/EntUserCredential.java | 6 +- .../com/rzyc/model/{ => ent}/EntUserType.java | 4 +- .../java/com/rzyc/model/ex/ExExamine.java | 169 +++++++++++ .../java/com/rzyc/model/ex/ExExamineItem.java | 187 ++++++++++++ .../java/com/rzyc/model/ex/ExStandard.java | 211 +++++++++++++ .../com/rzyc/model/{ => sys}/SysCode.java | 2 +- .../rzyc/model/{ => sys}/SysCodeExample.java | 2 +- .../rzyc/model/{ => sys}/SysDocumenttemp.java | 2 +- .../com/rzyc/model/{ => sys}/SysLogAuth.java | 2 +- .../model/{ => sys}/SysLogAuthExample.java | 2 +- .../com/rzyc/model/{ => sys}/SysLogOpt.java | 2 +- .../model/{ => sys}/SysLogOptExample.java | 2 +- .../model/{ => sys}/SysLogOptWithBLOBs.java | 2 +- .../java/com/rzyc/model/{ => sys}/SysOrg.java | 2 +- .../rzyc/model/{ => sys}/SysOrgExample.java | 2 +- .../com/rzyc/model/{ => sys}/SysRole.java | 2 +- .../rzyc/model/{ => sys}/SysRoleExample.java | 2 +- .../rzyc/model/{ => sys}/SysRoleResource.java | 2 +- .../{ => sys}/SysRoleResourceExample.java | 2 +- .../com/rzyc/model/{ => sys}/SysStatute.java | 2 +- .../rzyc/model/{ => sys}/SysStatuteDesc.java | 2 +- .../{ => sys}/SysStatuteDescExample.java | 2 +- .../model/{ => sys}/SysStatuteExample.java | 2 +- .../rzyc/model/{ => sys}/SysUnitTrade.java | 4 +- .../com/rzyc/model/{ => sys}/SysWarning.java | 2 +- .../rzyc/model/{ => sys}/SysWarningType.java | 2 +- .../rzyc/model/{ => sys}/SysWarningUser.java | 2 +- .../com/rzyc/model/{ => sys}/Sysdocument.java | 2 +- .../model/{ => sys}/SysdocumentExample.java | 2 +- .../model/{ => sys}/SysdocumentWithBLOBs.java | 2 +- .../java/com/rzyc/model/user/ListPerform.java | 4 + .../{ => ent}/EntCertificatesMapper.xml | 4 +- .../{ => ent}/EntDeviceInsCycleMapper.xml | 4 +- .../EntDeviceMaintenancePlanMapper.xml | 4 +- .../EntDeviceMaintenanceRecordMapper.xml | 4 +- .../mapper/{ => ent}/EntDeviceMapper.xml | 18 +- .../mapper/{ => ent}/EntDeviceTypeMapper.xml | 4 +- .../mapper/{ => ent}/EntEmEquipmentMapper.xml | 4 +- .../mapper/{ => ent}/EntEmExpertMapper.xml | 4 +- .../mapper/{ => ent}/EntEmRehearsalMapper.xml | 4 +- .../{ => ent}/EntEmReservePlanMapper.xml | 4 +- .../mapper/{ => ent}/EntInsRecordMapper.xml | 8 +- .../{ => ent}/EntInspectionRecordMapper.xml | 4 +- .../EntOperatingInstructionMapper.xml | 4 +- .../mapper/{ => ent}/EntPostDutyMapper.xml | 4 +- .../{ => ent}/EntPostListDetailMapper.xml | 4 +- .../mapper/{ => ent}/EntPostListMapper.xml | 8 +- .../mapper/{ => ent}/EntPostTaskMapper.xml | 8 +- .../mapper/{ => ent}/EntRepairPlanMapper.xml | 4 +- .../{ => ent}/EntRepairRecordMapper.xml | 8 +- .../{ => ent}/EntReportRepairMapper.xml | 4 +- .../{ => ent}/EntUserCredentialMapper.xml | 8 +- .../mapper/{ => ent}/EntUserTypeMapper.xml | 4 +- .../mapper/ex/ExExamineItemMapper.xml | 28 ++ .../resources/mapper/ex/ExExamineMapper.xml | 43 +++ .../resources/mapper/ex/ExStandardMapper.xml | 30 ++ .../mapper/{ => sys}/SysCodeMapper.xml | 24 +- .../{ => sys}/SysDocumenttempMapper.xml | 4 +- .../mapper/{ => sys}/SysLogAuthMapper.xml | 18 +- .../mapper/{ => sys}/SysLogOptMapper.xml | 24 +- .../mapper/{ => sys}/SysLogsMapper.xml | 0 .../mapper/{ => sys}/SysOrgMapper.xml | 18 +- .../mapper/{ => sys}/SysResourceMapper.xml | 0 .../mapper/{ => sys}/SysRoleMapper.xml | 18 +- .../{ => sys}/SysRoleResourceMapper.xml | 14 +- .../mapper/{ => sys}/SysStatuteDescMapper.xml | 18 +- .../mapper/{ => sys}/SysStatuteMapper.xml | 14 +- .../mapper/{ => sys}/SysUnitTradeMapper.xml | 4 +- .../mapper/{ => sys}/SysWarningMapper.xml | 4 +- .../mapper/{ => sys}/SysWarningTypeMapper.xml | 6 +- .../mapper/{ => sys}/SysWarningUserMapper.xml | 6 +- .../mapper/{ => sys}/SysdocumentMapper.xml | 14 +- .../mapper/user/ListPerformMapper.xml | 10 +- .../com/rzyc/controller/BaseController.java | 3 + .../com/rzyc/controller/CommonController.java | 2 +- .../EmergencyEquipmentController.java | 9 +- .../EnterpriseEquipmentController.java | 10 +- .../rzyc/controller/MinWorkController.java | 29 -- .../com/rzyc/controller/OtherController.java | 2 +- .../rzyc/controller/PcCompanyController.java | 5 +- .../rzyc/controller/PersonalController.java | 6 +- .../com/rzyc/controller/UploadController.java | 6 +- .../rzyc/service/AssignmentTaskThread.java | 8 +- .../rzyc/service/DeviceInspectionCycle.java | 8 +- .../com/rzyc/service/EntPostDutyThread.java | 4 +- .../rzyc/service/MobileBusinessService.java | 2 +- .../com/rzyc/service/PcBusinessService.java | 6 +- .../service/SaveEntPostAndUserThread.java | 7 +- .../rzyc/service/SaveIndustryPostThread.java | 8 +- .../easyexcel/EntEnterpriseListener.java | 12 +- .../java/com/rzyc/advice/LoginAspect.java | 2 +- .../com/rzyc/controller/BaseController.java | 20 ++ .../com/rzyc/controller/DataController.java | 10 +- .../EnterpriseRecordController.java | 7 +- .../rzyc/controller/ExamineController.java | 282 ++++++++++++++++++ .../com/rzyc/controller/ImportController.java | 10 +- .../rzyc/controller/MinWorkController.java | 2 +- .../com/rzyc/controller/OtherController.java | 4 +- .../rzyc/controller/PcPersonalController.java | 6 +- .../rzyc/controller/SettingController.java | 8 +- .../com/rzyc/controller/TaskController.java | 8 +- .../com/rzyc/controller/UploadController.java | 2 +- .../com/rzyc/controller/WorkController.java | 8 +- .../com/rzyc/controller/WxContorller.java | 3 +- .../ent/OrganizationController.java | 2 +- .../controller/ent/PcCheckController.java | 2 + .../controller/ent/PcCompanyController.java | 1 + .../ent/WxProductionController.java | 6 +- .../rzyc/service/AssignmentTaskThread.java | 11 +- .../service/SaveEntPostAndUserThread.java | 7 +- .../rzyc/service/SaveIndustryPostThread.java | 8 +- .../java/com/rzyc/service/TaskService.java | 3 + .../src/main/resources/application.yml | 2 +- 187 files changed, 1910 insertions(+), 518 deletions(-) create mode 100644 inventory-dao/src/main/java/com/rzyc/bean/ex/ExamineChangeDto.java create mode 100644 inventory-dao/src/main/java/com/rzyc/bean/ex/ItemAddBonusDto.java create mode 100644 inventory-dao/src/main/java/com/rzyc/bean/ex/ItemAddDto.java create mode 100644 inventory-dao/src/main/java/com/rzyc/bean/ex/ItemAddSpecificDto.java create mode 100644 inventory-dao/src/main/java/com/rzyc/bean/ex/UnitListDto.java create mode 100644 inventory-dao/src/main/java/com/rzyc/enums/ExItemType.java create mode 100644 inventory-dao/src/main/java/com/rzyc/enums/ExamineState.java rename inventory-dao/src/main/java/com/rzyc/mapper/{ => ent}/EntCertificatesMapper.java (93%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => ent}/EntDeviceInsCycleMapper.java (85%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => ent}/EntDeviceMaintenancePlanMapper.java (91%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => ent}/EntDeviceMaintenanceRecordMapper.java (90%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => ent}/EntDeviceMapper.java (94%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => ent}/EntDeviceTypeMapper.java (93%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => ent}/EntEmEquipmentMapper.java (91%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => ent}/EntEmExpertMapper.java (93%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => ent}/EntEmRehearsalMapper.java (91%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => ent}/EntEmReservePlanMapper.java (89%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => ent}/EntInsRecordMapper.java (92%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => ent}/EntInspectionRecordMapper.java (92%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => ent}/EntOperatingInstructionMapper.java (91%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => ent}/EntPostDutyMapper.java (93%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => ent}/EntPostListDetailMapper.java (87%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => ent}/EntPostListMapper.java (96%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => ent}/EntPostTaskMapper.java (96%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => ent}/EntRepairPlanMapper.java (91%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => ent}/EntRepairRecordMapper.java (90%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => ent}/EntReportRepairMapper.java (90%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => ent}/EntUserCredentialMapper.java (92%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => ent}/EntUserTypeMapper.java (83%) create mode 100644 inventory-dao/src/main/java/com/rzyc/mapper/ex/ExExamineItemMapper.java create mode 100644 inventory-dao/src/main/java/com/rzyc/mapper/ex/ExExamineMapper.java create mode 100644 inventory-dao/src/main/java/com/rzyc/mapper/ex/ExStandardMapper.java rename inventory-dao/src/main/java/com/rzyc/mapper/{ => sys}/SysCodeMapper.java (91%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => sys}/SysDocumenttempMapper.java (86%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => sys}/SysLogAuthMapper.java (89%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => sys}/SysLogOptMapper.java (88%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => sys}/SysOrgMapper.java (96%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => sys}/SysRoleMapper.java (91%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => sys}/SysRoleResourceMapper.java (87%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => sys}/SysStatuteDescMapper.java (90%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => sys}/SysStatuteMapper.java (89%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => sys}/SysUnitTradeMapper.java (85%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => sys}/SysWarningMapper.java (87%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => sys}/SysWarningTypeMapper.java (80%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => sys}/SysWarningUserMapper.java (90%) rename inventory-dao/src/main/java/com/rzyc/mapper/{ => sys}/SysdocumentMapper.java (88%) rename inventory-dao/src/main/java/com/rzyc/model/{ => ent}/EntCertificates.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => ent}/EntDevice.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => ent}/EntDeviceInsCycle.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => ent}/EntDeviceInsStatistic.java (96%) rename inventory-dao/src/main/java/com/rzyc/model/{ => ent}/EntDeviceMaintenancePlan.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => ent}/EntDeviceMaintenanceRecord.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => ent}/EntDeviceType.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => ent}/EntEmEquipment.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => ent}/EntEmExpert.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => ent}/EntEmRehearsal.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => ent}/EntEmReservePlan.java (98%) rename inventory-dao/src/main/java/com/rzyc/model/{ => ent}/EntInsRecord.java (98%) rename inventory-dao/src/main/java/com/rzyc/model/{ => ent}/EntInspectionRecord.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => ent}/EntOperatingInstruction.java (98%) rename inventory-dao/src/main/java/com/rzyc/model/{ => ent}/EntPostDuty.java (98%) rename inventory-dao/src/main/java/com/rzyc/model/{ => ent}/EntPostList.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => ent}/EntPostListDetail.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => ent}/EntPostTask.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => ent}/EntPostTaskStatistic.java (96%) rename inventory-dao/src/main/java/com/rzyc/model/{ => ent}/EntRepairPlan.java (98%) rename inventory-dao/src/main/java/com/rzyc/model/{ => ent}/EntRepairRecord.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => ent}/EntReportRepair.java (98%) rename inventory-dao/src/main/java/com/rzyc/model/{ => ent}/EntUserCredential.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => ent}/EntUserType.java (97%) create mode 100644 inventory-dao/src/main/java/com/rzyc/model/ex/ExExamine.java create mode 100644 inventory-dao/src/main/java/com/rzyc/model/ex/ExExamineItem.java create mode 100644 inventory-dao/src/main/java/com/rzyc/model/ex/ExStandard.java rename inventory-dao/src/main/java/com/rzyc/model/{ => sys}/SysCode.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => sys}/SysCodeExample.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => sys}/SysDocumenttemp.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => sys}/SysLogAuth.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => sys}/SysLogAuthExample.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => sys}/SysLogOpt.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => sys}/SysLogOptExample.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => sys}/SysLogOptWithBLOBs.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => sys}/SysOrg.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => sys}/SysOrgExample.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => sys}/SysRole.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => sys}/SysRoleExample.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => sys}/SysRoleResource.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => sys}/SysRoleResourceExample.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => sys}/SysStatute.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => sys}/SysStatuteDesc.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => sys}/SysStatuteDescExample.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => sys}/SysStatuteExample.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => sys}/SysUnitTrade.java (98%) rename inventory-dao/src/main/java/com/rzyc/model/{ => sys}/SysWarning.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => sys}/SysWarningType.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => sys}/SysWarningUser.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => sys}/Sysdocument.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => sys}/SysdocumentExample.java (99%) rename inventory-dao/src/main/java/com/rzyc/model/{ => sys}/SysdocumentWithBLOBs.java (99%) rename inventory-dao/src/main/resources/mapper/{ => ent}/EntCertificatesMapper.xml (94%) rename inventory-dao/src/main/resources/mapper/{ => ent}/EntDeviceInsCycleMapper.xml (96%) rename inventory-dao/src/main/resources/mapper/{ => ent}/EntDeviceMaintenancePlanMapper.xml (94%) rename inventory-dao/src/main/resources/mapper/{ => ent}/EntDeviceMaintenanceRecordMapper.xml (95%) rename inventory-dao/src/main/resources/mapper/{ => ent}/EntDeviceMapper.xml (94%) rename inventory-dao/src/main/resources/mapper/{ => ent}/EntDeviceTypeMapper.xml (94%) rename inventory-dao/src/main/resources/mapper/{ => ent}/EntEmEquipmentMapper.xml (93%) rename inventory-dao/src/main/resources/mapper/{ => ent}/EntEmExpertMapper.xml (95%) rename inventory-dao/src/main/resources/mapper/{ => ent}/EntEmRehearsalMapper.xml (93%) rename inventory-dao/src/main/resources/mapper/{ => ent}/EntEmReservePlanMapper.xml (92%) rename inventory-dao/src/main/resources/mapper/{ => ent}/EntInsRecordMapper.xml (95%) rename inventory-dao/src/main/resources/mapper/{ => ent}/EntInspectionRecordMapper.xml (94%) rename inventory-dao/src/main/resources/mapper/{ => ent}/EntOperatingInstructionMapper.xml (91%) rename inventory-dao/src/main/resources/mapper/{ => ent}/EntPostDutyMapper.xml (93%) rename inventory-dao/src/main/resources/mapper/{ => ent}/EntPostListDetailMapper.xml (93%) rename inventory-dao/src/main/resources/mapper/{ => ent}/EntPostListMapper.xml (96%) rename inventory-dao/src/main/resources/mapper/{ => ent}/EntPostTaskMapper.xml (95%) rename inventory-dao/src/main/resources/mapper/{ => ent}/EntRepairPlanMapper.xml (93%) rename inventory-dao/src/main/resources/mapper/{ => ent}/EntRepairRecordMapper.xml (96%) rename inventory-dao/src/main/resources/mapper/{ => ent}/EntReportRepairMapper.xml (93%) rename inventory-dao/src/main/resources/mapper/{ => ent}/EntUserCredentialMapper.xml (94%) rename inventory-dao/src/main/resources/mapper/{ => ent}/EntUserTypeMapper.xml (81%) create mode 100644 inventory-dao/src/main/resources/mapper/ex/ExExamineItemMapper.xml create mode 100644 inventory-dao/src/main/resources/mapper/ex/ExExamineMapper.xml create mode 100644 inventory-dao/src/main/resources/mapper/ex/ExStandardMapper.xml rename inventory-dao/src/main/resources/mapper/{ => sys}/SysCodeMapper.xml (94%) rename inventory-dao/src/main/resources/mapper/{ => sys}/SysDocumenttempMapper.xml (88%) rename inventory-dao/src/main/resources/mapper/{ => sys}/SysLogAuthMapper.xml (95%) rename inventory-dao/src/main/resources/mapper/{ => sys}/SysLogOptMapper.xml (95%) rename inventory-dao/src/main/resources/mapper/{ => sys}/SysLogsMapper.xml (100%) rename inventory-dao/src/main/resources/mapper/{ => sys}/SysOrgMapper.xml (97%) rename inventory-dao/src/main/resources/mapper/{ => sys}/SysResourceMapper.xml (100%) rename inventory-dao/src/main/resources/mapper/{ => sys}/SysRoleMapper.xml (94%) rename inventory-dao/src/main/resources/mapper/{ => sys}/SysRoleResourceMapper.xml (92%) rename inventory-dao/src/main/resources/mapper/{ => sys}/SysStatuteDescMapper.xml (92%) rename inventory-dao/src/main/resources/mapper/{ => sys}/SysStatuteMapper.xml (93%) rename inventory-dao/src/main/resources/mapper/{ => sys}/SysUnitTradeMapper.xml (85%) rename inventory-dao/src/main/resources/mapper/{ => sys}/SysWarningMapper.xml (91%) rename inventory-dao/src/main/resources/mapper/{ => sys}/SysWarningTypeMapper.xml (90%) rename inventory-dao/src/main/resources/mapper/{ => sys}/SysWarningUserMapper.xml (92%) rename inventory-dao/src/main/resources/mapper/{ => sys}/SysdocumentMapper.xml (94%) create mode 100644 inventory-gov/src/main/java/com/rzyc/controller/ExamineController.java diff --git a/inventory-dao/src/main/java/com/rzyc/bean/bigdata/wx/WxCheckInfo.java b/inventory-dao/src/main/java/com/rzyc/bean/bigdata/wx/WxCheckInfo.java index 86a3bb2..0c88cd3 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/bigdata/wx/WxCheckInfo.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/bigdata/wx/WxCheckInfo.java @@ -1,7 +1,7 @@ package com.rzyc.bean.bigdata.wx; import com.rzyc.bean.bigdata.check.CheckRiskNum; -import com.rzyc.model.SysOrg; +import com.rzyc.model.sys.SysOrg; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/inventory-dao/src/main/java/com/rzyc/bean/bigdata/wx/WxDutyNet.java b/inventory-dao/src/main/java/com/rzyc/bean/bigdata/wx/WxDutyNet.java index 61c41e3..440472a 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/bigdata/wx/WxDutyNet.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/bigdata/wx/WxDutyNet.java @@ -1,6 +1,6 @@ package com.rzyc.bean.bigdata.wx; -import com.rzyc.model.SysOrg; +import com.rzyc.model.sys.SysOrg; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/inventory-dao/src/main/java/com/rzyc/bean/ex/ExamineChangeDto.java b/inventory-dao/src/main/java/com/rzyc/bean/ex/ExamineChangeDto.java new file mode 100644 index 0000000..154055b --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/bean/ex/ExamineChangeDto.java @@ -0,0 +1,63 @@ +package com.rzyc.bean.ex; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import javax.validation.constraints.NotNull; + + +/** + * @author dong + * @date 2024-04-01 14:01 + * @Version V1.0 + */ +@ApiModel("党政同责信息修改") +public class ExamineChangeDto { + + @NotNull(message = "考核不能为空") + @ApiModelProperty(value = "考核id",required = true) + private String examineId; + + @ApiModelProperty(value = "开始时间 yyyy-MM-dd",required = true) + private String startTime; + + @ApiModelProperty(value = "结束时间 yyyy-MM-dd",required = true) + @TableField("end_time") + private String endTime; + + @ApiModelProperty(value = "状态 1、审核中 2、已发布 3、上传资料 4、评分中 5、评分完成",required = true) + private Integer state; + + public String getExamineId() { + return examineId; + } + + public void setExamineId(String examineId) { + this.examineId = examineId; + } + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public Integer getState() { + return state; + } + + public void setState(Integer state) { + this.state = state; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/bean/ex/ItemAddBonusDto.java b/inventory-dao/src/main/java/com/rzyc/bean/ex/ItemAddBonusDto.java new file mode 100644 index 0000000..26bfd56 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/bean/ex/ItemAddBonusDto.java @@ -0,0 +1,64 @@ +package com.rzyc.bean.ex; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import javax.validation.constraints.NotNull; + +/** + * 加分项标准新增 + * @author dong + * @date 2024-04-01 15:21 + * @Version V1.0 + */ +@ApiModel("加分项考核指标新增") +public class ItemAddBonusDto { + + @NotNull(message = "考核不能为空") + @ApiModelProperty(value = "考核id",required = true) + private String examineId; + + @NotNull(message = "考核标准不能为空") + @ApiModelProperty(value = "考核标准",required = true) + private String title; + + @NotNull(message = "排序不能为空") + @ApiModelProperty(value = "排序",required = true) + private Integer sortId; + + @NotNull(message = "考核类型不能为空") + @ApiModelProperty(value = "党政同责考核类型 1、直属部门 2、监管部门 3、市县",required = true) + private Integer examineState; + + public String getExamineId() { + return examineId; + } + + public void setExamineId(String examineId) { + this.examineId = examineId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public Integer getSortId() { + return sortId; + } + + public void setSortId(Integer sortId) { + this.sortId = sortId; + } + + public Integer getExamineState() { + return examineState; + } + + public void setExamineState(Integer examineState) { + this.examineState = examineState; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/bean/ex/ItemAddDto.java b/inventory-dao/src/main/java/com/rzyc/bean/ex/ItemAddDto.java new file mode 100644 index 0000000..78c702b --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/bean/ex/ItemAddDto.java @@ -0,0 +1,142 @@ +package com.rzyc.bean.ex; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import javax.validation.constraints.NotNull; + +/** + * 普通考核指标添加 + * @author dong + * @date 2024-04-01 13:44 + * @Version V1.0 + */ +@ApiModel("普通考核指标添加") +public class ItemAddDto { + + @NotNull(message = "考核不能为空") + @ApiModelProperty(value = "考核id",required = true) + private String examineId; + + @ApiModelProperty("考核指标") + private String indexName; + + @ApiModelProperty("考核指标id 传使用该id 不传则新增考核指标") + private String indexId; + + @ApiModelProperty("考核要点") + private String pointName; + + @ApiModelProperty("考核要点id 传使用该id 不传则新增考核要点") + private String pointId; + + @ApiModelProperty("考核内容") + private String content; + + @ApiModelProperty("考核内容id 传使用该id 不传则新增考核内容") + private String contentId; + + @NotNull(message = "考核标准不能为空") + @ApiModelProperty(value = "考核标准",required = true) + private String title; + + @NotNull(message = "标准分数不能为空") + @ApiModelProperty(value = "标准分数",required = true) + private Double score; + + @NotNull(message = "排序不能为空") + @ApiModelProperty(value = "排序",required = true) + private Integer sortId; + + @NotNull(message = "考核类型不能为空") + @ApiModelProperty(value = "党政同责考核类型 1、直属部门 2、监管部门 3、市县",required = true) + private Integer examineState; + + public String getExamineId() { + return examineId; + } + + public void setExamineId(String examineId) { + this.examineId = examineId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public Double getScore() { + return score; + } + + public void setScore(Double score) { + this.score = score; + } + + public Integer getSortId() { + return sortId; + } + + public void setSortId(Integer sortId) { + this.sortId = sortId; + } + + public Integer getExamineState() { + return examineState; + } + + public void setExamineState(Integer examineState) { + this.examineState = examineState; + } + + public String getIndexName() { + return indexName; + } + + public void setIndexName(String indexName) { + this.indexName = indexName; + } + + public String getIndexId() { + return indexId; + } + + public void setIndexId(String indexId) { + this.indexId = indexId; + } + + public String getPointName() { + return pointName; + } + + public void setPointName(String pointName) { + this.pointName = pointName; + } + + public String getPointId() { + return pointId; + } + + public void setPointId(String pointId) { + this.pointId = pointId; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getContentId() { + return contentId; + } + + public void setContentId(String contentId) { + this.contentId = contentId; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/bean/ex/ItemAddSpecificDto.java b/inventory-dao/src/main/java/com/rzyc/bean/ex/ItemAddSpecificDto.java new file mode 100644 index 0000000..7f547d4 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/bean/ex/ItemAddSpecificDto.java @@ -0,0 +1,89 @@ +package com.rzyc.bean.ex; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import javax.validation.constraints.NotNull; + +/** + * 部门个性标准上传 + * @author dong + * @date 2024-04-01 15:47 + * @Version V1.0 + */ +@ApiModel("部门个性标准上传") +public class ItemAddSpecificDto { + + + @NotNull(message = "考核不能为空") + @ApiModelProperty(value = "考核id",required = true) + private String examineId; + + @NotNull(message = "考核标准不能为空") + @ApiModelProperty(value = "考核标准",required = true) + private String title; + + @NotNull(message = "排序不能为空") + @ApiModelProperty(value = "排序",required = true) + private Integer sortId; + + @NotNull(message = "考核类型不能为空") + @ApiModelProperty(value = "党政同责考核类型 1、直属部门 2、监管部门 3、市县",required = true) + private Integer examineState; + + @NotNull(message = "标准分数不能为空") + @ApiModelProperty(value = "标准分数",required = true) + private Double score; + + @NotNull(message="部门不能为空") + @ApiModelProperty(value = "部门id",required = true) + private String listperformid; + + public String getExamineId() { + return examineId; + } + + public void setExamineId(String examineId) { + this.examineId = examineId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public Integer getSortId() { + return sortId; + } + + public void setSortId(Integer sortId) { + this.sortId = sortId; + } + + public Integer getExamineState() { + return examineState; + } + + public void setExamineState(Integer examineState) { + this.examineState = examineState; + } + + public Double getScore() { + return score; + } + + public void setScore(Double score) { + this.score = score; + } + + public String getListperformid() { + return listperformid; + } + + public void setListperformid(String listperformid) { + this.listperformid = listperformid; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/bean/ex/UnitListDto.java b/inventory-dao/src/main/java/com/rzyc/bean/ex/UnitListDto.java new file mode 100644 index 0000000..c110cbb --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/bean/ex/UnitListDto.java @@ -0,0 +1,28 @@ +package com.rzyc.bean.ex; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import javax.validation.constraints.NotNull; + +/** + * 党政同责考核部门列表 + * @author dong + * @date 2024-04-01 15:34 + * @Version V1.0 + */ +@ApiModel("党政同责考核部门列表") +public class UnitListDto { + + @NotNull(message = "考核类型不能为空") + @ApiModelProperty(value = "党政同责考核类型 1、直属部门 2、监管部门",required = true) + private Integer examineState; + + public Integer getExamineState() { + return examineState; + } + + public void setExamineState(Integer examineState) { + this.examineState = examineState; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/bean/file/FileResult.java b/inventory-dao/src/main/java/com/rzyc/bean/file/FileResult.java index a764364..c435010 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/file/FileResult.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/file/FileResult.java @@ -1,7 +1,7 @@ package com.rzyc.bean.file; import com.common.utils.model.Code; -import com.rzyc.model.Sysdocument; +import com.rzyc.model.sys.Sysdocument; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/inventory-dao/src/main/java/com/rzyc/bean/file/FileResults.java b/inventory-dao/src/main/java/com/rzyc/bean/file/FileResults.java index c6cce81..ecb8bf8 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/file/FileResults.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/file/FileResults.java @@ -1,7 +1,7 @@ package com.rzyc.bean.file; import com.common.utils.model.Code; -import com.rzyc.model.Sysdocument; +import com.rzyc.model.sys.Sysdocument; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/inventory-dao/src/main/java/com/rzyc/enums/ExItemType.java b/inventory-dao/src/main/java/com/rzyc/enums/ExItemType.java new file mode 100644 index 0000000..12629c9 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/enums/ExItemType.java @@ -0,0 +1,31 @@ +package com.rzyc.enums; + +/** + * 考核项类型 1、普通 2、个性 3、加分项 + * @author dong + * @date 2024-04-01 14:52 + * @Version V1.0 + */ +public enum ExItemType { + + //普通 + ORDINARY(1), + //个性 + PERSONALITY(2), + //加分项 + BONUS_POINT(3); + + private Integer type; + + ExItemType(Integer type) { + this.type = type; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/enums/ExamineState.java b/inventory-dao/src/main/java/com/rzyc/enums/ExamineState.java new file mode 100644 index 0000000..b9e9145 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/enums/ExamineState.java @@ -0,0 +1,30 @@ +package com.rzyc.enums; + +/** + * 状态 1、审核中 2、已发布 3、上传资料 4、评分中 5、评分完成 + * @version v1.0 + * @author dong + * @date 2024/4/1 11:33 + */ +public enum ExamineState { + + AUDITING(1), + RELEASE(2), + UPLOAD(3), + SCOREING(4), + COMPLETE(5); + + private Integer state; + + ExamineState(Integer state) { + this.state = state; + } + + public Integer getState() { + return state; + } + + public void setState(Integer state) { + this.state = state; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntCertificatesMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntCertificatesMapper.java similarity index 93% rename from inventory-dao/src/main/java/com/rzyc/mapper/EntCertificatesMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/ent/EntCertificatesMapper.java index ca22da7..1c06ffc 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntCertificatesMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntCertificatesMapper.java @@ -1,6 +1,6 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.ent; -import com.rzyc.model.EntCertificates; +import com.rzyc.model.ent.EntCertificates; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceInsCycleMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntDeviceInsCycleMapper.java similarity index 85% rename from inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceInsCycleMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/ent/EntDeviceInsCycleMapper.java index 6f87e30..64509fd 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceInsCycleMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntDeviceInsCycleMapper.java @@ -1,13 +1,10 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.ent; -import com.rzyc.model.EntDeviceInsCycle; +import com.rzyc.model.ent.EntDeviceInsCycle; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.rzyc.model.dto.AddOrUpdateDeviceInspectionCycleDto; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import org.springframework.web.bind.annotation.RequestBody; -import java.util.Date; import java.util.List; /** @@ -15,7 +12,7 @@ import java.util.List; * Mapper 接口 *

* - * @author + * @author * @since 2022-10-21 */ @Repository diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceMaintenancePlanMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntDeviceMaintenancePlanMapper.java similarity index 91% rename from inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceMaintenancePlanMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/ent/EntDeviceMaintenancePlanMapper.java index d997b40..522d38b 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceMaintenancePlanMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntDeviceMaintenancePlanMapper.java @@ -1,6 +1,6 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.ent; -import com.rzyc.model.EntDeviceMaintenancePlan; +import com.rzyc.model.ent.EntDeviceMaintenancePlan; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -12,7 +12,7 @@ import java.util.List; * Mapper 接口 *

* - * @author + * @author * @since 2022-10-21 */ @Repository diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceMaintenanceRecordMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntDeviceMaintenanceRecordMapper.java similarity index 90% rename from inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceMaintenanceRecordMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/ent/EntDeviceMaintenanceRecordMapper.java index 494a07d..ada4ec5 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceMaintenanceRecordMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntDeviceMaintenanceRecordMapper.java @@ -1,6 +1,6 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.ent; -import com.rzyc.model.EntDeviceMaintenanceRecord; +import com.rzyc.model.ent.EntDeviceMaintenanceRecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -12,7 +12,7 @@ import java.util.List; * Mapper 接口 *

* - * @author + * @author * @since 2022-10-25 */ @Repository diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntDeviceMapper.java similarity index 94% rename from inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/ent/EntDeviceMapper.java index be635eb..997403b 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntDeviceMapper.java @@ -1,8 +1,8 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.ent; -import com.rzyc.model.EntDevice; +import com.rzyc.model.ent.EntDevice; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.rzyc.model.EntDeviceInsStatistic; +import com.rzyc.model.ent.EntDeviceInsStatistic; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -13,7 +13,7 @@ import java.util.List; * 设备 Mapper 接口 *

* - * @author + * @author * @since 2022-10-18 */ @Repository diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceTypeMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntDeviceTypeMapper.java similarity index 93% rename from inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceTypeMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/ent/EntDeviceTypeMapper.java index d1ef608..4b1bf36 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceTypeMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntDeviceTypeMapper.java @@ -1,6 +1,6 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.ent; -import com.rzyc.model.EntDeviceType; +import com.rzyc.model.ent.EntDeviceType; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -12,7 +12,7 @@ import java.util.List; * 设备分类 Mapper 接口 *

* - * @author + * @author * @since 2022-10-18 */ @Repository diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntEmEquipmentMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntEmEquipmentMapper.java similarity index 91% rename from inventory-dao/src/main/java/com/rzyc/mapper/EntEmEquipmentMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/ent/EntEmEquipmentMapper.java index 66da079..57ea0d7 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntEmEquipmentMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntEmEquipmentMapper.java @@ -1,6 +1,6 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.ent; -import com.rzyc.model.EntEmEquipment; +import com.rzyc.model.ent.EntEmEquipment; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -12,7 +12,7 @@ import java.util.List; * 企业应急资源表 Mapper 接口 *

* - * @author + * @author * @since 2022-11-09 */ @Repository diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntEmExpertMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntEmExpertMapper.java similarity index 93% rename from inventory-dao/src/main/java/com/rzyc/mapper/EntEmExpertMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/ent/EntEmExpertMapper.java index ad48d15..f034415 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntEmExpertMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntEmExpertMapper.java @@ -1,6 +1,6 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.ent; -import com.rzyc.model.EntEmExpert; +import com.rzyc.model.ent.EntEmExpert; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -12,7 +12,7 @@ import java.util.List; * 企业应急专家 Mapper 接口 *

* - * @author + * @author * @since 2022-11-09 */ @Repository diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntEmRehearsalMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntEmRehearsalMapper.java similarity index 91% rename from inventory-dao/src/main/java/com/rzyc/mapper/EntEmRehearsalMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/ent/EntEmRehearsalMapper.java index 75d87e9..b4cfdfb 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntEmRehearsalMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntEmRehearsalMapper.java @@ -1,6 +1,6 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.ent; -import com.rzyc.model.EntEmRehearsal; +import com.rzyc.model.ent.EntEmRehearsal; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -12,7 +12,7 @@ import java.util.List; * 应急演练 Mapper 接口 *

* - * @author + * @author * @since 2022-11-09 */ @Repository diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntEmReservePlanMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntEmReservePlanMapper.java similarity index 89% rename from inventory-dao/src/main/java/com/rzyc/mapper/EntEmReservePlanMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/ent/EntEmReservePlanMapper.java index ffaed14..0a87429 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntEmReservePlanMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntEmReservePlanMapper.java @@ -1,7 +1,6 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.ent; -import com.rzyc.model.EntEmExpert; -import com.rzyc.model.EntEmReservePlan; +import com.rzyc.model.ent.EntEmReservePlan; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -13,7 +12,7 @@ import java.util.List; * 企业应急预警 Mapper 接口 *

* - * @author + * @author * @since 2022-11-09 */ @Repository diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntInsRecordMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntInsRecordMapper.java similarity index 92% rename from inventory-dao/src/main/java/com/rzyc/mapper/EntInsRecordMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/ent/EntInsRecordMapper.java index 4a5eb78..8b5d523 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntInsRecordMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntInsRecordMapper.java @@ -1,6 +1,6 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.ent; -import com.rzyc.model.EntInsRecord; +import com.rzyc.model.ent.EntInsRecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -12,7 +12,7 @@ import java.util.List; * Mapper 接口 *

* - * @author + * @author * @since 2022-10-21 */ @Repository diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntInspectionRecordMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntInspectionRecordMapper.java similarity index 92% rename from inventory-dao/src/main/java/com/rzyc/mapper/EntInspectionRecordMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/ent/EntInspectionRecordMapper.java index b0bff11..af8f320 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntInspectionRecordMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntInspectionRecordMapper.java @@ -1,6 +1,6 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.ent; -import com.rzyc.model.EntInspectionRecord; +import com.rzyc.model.ent.EntInspectionRecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -12,7 +12,7 @@ import java.util.List; * 送检记录 Mapper 接口 *

* - * @author + * @author * @since 2022-10-27 */ @Repository diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntOperatingInstructionMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntOperatingInstructionMapper.java similarity index 91% rename from inventory-dao/src/main/java/com/rzyc/mapper/EntOperatingInstructionMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/ent/EntOperatingInstructionMapper.java index 0faa7eb..95411f2 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntOperatingInstructionMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntOperatingInstructionMapper.java @@ -1,6 +1,6 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.ent; -import com.rzyc.model.EntOperatingInstruction; +import com.rzyc.model.ent.EntOperatingInstruction; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -12,7 +12,7 @@ import java.util.List; * 操作规程 Mapper 接口 *

* - * @author + * @author * @since 2022-10-28 */ @Repository diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntPostDutyMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntPostDutyMapper.java similarity index 93% rename from inventory-dao/src/main/java/com/rzyc/mapper/EntPostDutyMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/ent/EntPostDutyMapper.java index ad41958..0c60dd1 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntPostDutyMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntPostDutyMapper.java @@ -1,6 +1,6 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.ent; -import com.rzyc.model.EntPostDuty; +import com.rzyc.model.ent.EntPostDuty; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -12,7 +12,7 @@ import java.util.List; * 岗位职责 Mapper 接口 *

* - * @author + * @author * @since 2022-10-09 */ @Repository diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntPostListDetailMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntPostListDetailMapper.java similarity index 87% rename from inventory-dao/src/main/java/com/rzyc/mapper/EntPostListDetailMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/ent/EntPostListDetailMapper.java index 1ccf251..45e9f17 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntPostListDetailMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntPostListDetailMapper.java @@ -1,6 +1,6 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.ent; -import com.rzyc.model.EntPostListDetail; +import com.rzyc.model.ent.EntPostListDetail; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -13,7 +13,7 @@ import java.util.List; Mapper 接口 *

* - * @author + * @author * @since 2022-12-08 */ @Repository diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntPostListMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntPostListMapper.java similarity index 96% rename from inventory-dao/src/main/java/com/rzyc/mapper/EntPostListMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/ent/EntPostListMapper.java index 63dee2b..4fe24e8 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntPostListMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntPostListMapper.java @@ -1,8 +1,7 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.ent; -import com.rzyc.model.EntPostList; +import com.rzyc.model.ent.EntPostList; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.rzyc.model.EntPostTask; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -13,7 +12,7 @@ import java.util.List; * 工作要务清单 Mapper 接口 *

* - * @author + * @author * @since 2022-10-08 */ @Repository diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntPostTaskMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntPostTaskMapper.java similarity index 96% rename from inventory-dao/src/main/java/com/rzyc/mapper/EntPostTaskMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/ent/EntPostTaskMapper.java index cb1e6e0..ce43c38 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntPostTaskMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntPostTaskMapper.java @@ -1,8 +1,8 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.ent; -import com.rzyc.model.EntPostTask; +import com.rzyc.model.ent.EntPostTask; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.rzyc.model.EntPostTaskStatistic; +import com.rzyc.model.ent.EntPostTaskStatistic; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntRepairPlanMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntRepairPlanMapper.java similarity index 91% rename from inventory-dao/src/main/java/com/rzyc/mapper/EntRepairPlanMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/ent/EntRepairPlanMapper.java index 20b7b0a..a3a4ca2 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntRepairPlanMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntRepairPlanMapper.java @@ -1,6 +1,6 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.ent; -import com.rzyc.model.EntRepairPlan; +import com.rzyc.model.ent.EntRepairPlan; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -12,7 +12,7 @@ import java.util.List; * Mapper 接口 *

* - * @author + * @author * @since 2022-10-27 */ @Repository diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntRepairRecordMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntRepairRecordMapper.java similarity index 90% rename from inventory-dao/src/main/java/com/rzyc/mapper/EntRepairRecordMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/ent/EntRepairRecordMapper.java index c50fd08..0db32c9 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntRepairRecordMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntRepairRecordMapper.java @@ -1,6 +1,6 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.ent; -import com.rzyc.model.EntRepairRecord; +import com.rzyc.model.ent.EntRepairRecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.springframework.stereotype.Repository; @@ -11,7 +11,7 @@ import java.util.List; * Mapper 接口 *

* - * @author + * @author * @since 2022-10-28 */ @Repository diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntReportRepairMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntReportRepairMapper.java similarity index 90% rename from inventory-dao/src/main/java/com/rzyc/mapper/EntReportRepairMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/ent/EntReportRepairMapper.java index 390f115..2a87ccc 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntReportRepairMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntReportRepairMapper.java @@ -1,6 +1,6 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.ent; -import com.rzyc.model.EntReportRepair; +import com.rzyc.model.ent.EntReportRepair; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -12,7 +12,7 @@ import java.util.List; * Mapper 接口 *

* - * @author + * @author * @since 2022-10-28 */ @Repository diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntUserCredentialMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntUserCredentialMapper.java similarity index 92% rename from inventory-dao/src/main/java/com/rzyc/mapper/EntUserCredentialMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/ent/EntUserCredentialMapper.java index 67096c9..9e1d636 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntUserCredentialMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntUserCredentialMapper.java @@ -1,8 +1,7 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.ent; -import com.rzyc.model.EntUserCredential; +import com.rzyc.model.ent.EntUserCredential; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.rzyc.model.dto.EntUserCredentialUpdateDto; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -13,7 +12,7 @@ import java.util.List; * Mapper 接口 *

* - * @author + * @author * @since 2022-10-09 */ @Repository diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntUserTypeMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntUserTypeMapper.java similarity index 83% rename from inventory-dao/src/main/java/com/rzyc/mapper/EntUserTypeMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/ent/EntUserTypeMapper.java index 1eb561e..fd89777 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntUserTypeMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntUserTypeMapper.java @@ -1,6 +1,6 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.ent; -import com.rzyc.model.EntUserType; +import com.rzyc.model.ent.EntUserType; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.springframework.stereotype.Repository; @@ -11,7 +11,7 @@ import java.util.List; * 人员类型 Mapper 接口 *

* - * @author + * @author * @since 2022-11-08 */ @Repository diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ent/SysEnterpriseMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/SysEnterpriseMapper.java index c5b0685..1a3595c 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/ent/SysEnterpriseMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/SysEnterpriseMapper.java @@ -21,8 +21,6 @@ import com.rzyc.bean.organization.vo.AreaEntNum; import com.rzyc.bean.organization.vo.EnterpriseVo; import com.rzyc.bean.organization.vo.OrganizationNum; import com.rzyc.model.EasyExcel.EasyExcelEnterprise; -import com.rzyc.model.EasyExcel.EasyExcelInList; -import com.rzyc.model.SysOrg; import com.rzyc.model.ent.SysEnterprise; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExExamineItemMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExExamineItemMapper.java new file mode 100644 index 0000000..f0621e3 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExExamineItemMapper.java @@ -0,0 +1,16 @@ +package com.rzyc.mapper.ex; + +import com.rzyc.model.ex.ExExamineItem; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 考核项 Mapper 接口 + *

+ * + * @author + * @since 2024-04-01 + */ +public interface ExExamineItemMapper extends BaseMapper { + +} diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExExamineMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExExamineMapper.java new file mode 100644 index 0000000..23efa3f --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExExamineMapper.java @@ -0,0 +1,26 @@ +package com.rzyc.mapper.ex; + +import com.rzyc.model.ex.ExExamine; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 党政同责考核 Mapper 接口 + *

+ * + * @author + * @since 2024-04-01 + */ +public interface ExExamineMapper extends BaseMapper { + + /*考核列表*/ + List examineList(@Param("delState") Integer delState, @Param("yearNum") String yearNum, + @Param("condition") String condition); + + /*按照年份查询*/ + ExExamine findByYear(@Param("yearNum") String yearNum); + +} diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExStandardMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExStandardMapper.java new file mode 100644 index 0000000..2d59df3 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExStandardMapper.java @@ -0,0 +1,16 @@ +package com.rzyc.mapper.ex; + +import com.rzyc.model.ex.ExStandard; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 评分标准 Mapper 接口 + *

+ * + * @author + * @since 2024-04-01 + */ +public interface ExStandardMapper extends BaseMapper { + +} diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/SysCodeMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysCodeMapper.java similarity index 91% rename from inventory-dao/src/main/java/com/rzyc/mapper/SysCodeMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/sys/SysCodeMapper.java index 3ee85eb..37c75b8 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/SysCodeMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysCodeMapper.java @@ -1,7 +1,7 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.sys; -import com.rzyc.model.SysCode; -import com.rzyc.model.SysCodeExample; +import com.rzyc.model.sys.SysCode; +import com.rzyc.model.sys.SysCodeExample; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/SysDocumenttempMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysDocumenttempMapper.java similarity index 86% rename from inventory-dao/src/main/java/com/rzyc/mapper/SysDocumenttempMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/sys/SysDocumenttempMapper.java index 9be1e01..2f40201 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/SysDocumenttempMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysDocumenttempMapper.java @@ -1,6 +1,6 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.sys; -import com.rzyc.model.SysDocumenttemp; +import com.rzyc.model.sys.SysDocumenttemp; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/SysLogAuthMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysLogAuthMapper.java similarity index 89% rename from inventory-dao/src/main/java/com/rzyc/mapper/SysLogAuthMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/sys/SysLogAuthMapper.java index 281146a..c2f8933 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/SysLogAuthMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysLogAuthMapper.java @@ -1,7 +1,7 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.sys; -import com.rzyc.model.SysLogAuth; -import com.rzyc.model.SysLogAuthExample; +import com.rzyc.model.sys.SysLogAuth; +import com.rzyc.model.sys.SysLogAuthExample; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/SysLogOptMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysLogOptMapper.java similarity index 88% rename from inventory-dao/src/main/java/com/rzyc/mapper/SysLogOptMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/sys/SysLogOptMapper.java index 644fc0e..0f0097f 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/SysLogOptMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysLogOptMapper.java @@ -1,8 +1,8 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.sys; -import com.rzyc.model.SysLogOpt; -import com.rzyc.model.SysLogOptExample; -import com.rzyc.model.SysLogOptWithBLOBs; +import com.rzyc.model.sys.SysLogOpt; +import com.rzyc.model.sys.SysLogOptExample; +import com.rzyc.model.sys.SysLogOptWithBLOBs; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/SysOrgMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysOrgMapper.java similarity index 96% rename from inventory-dao/src/main/java/com/rzyc/mapper/SysOrgMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/sys/SysOrgMapper.java index 7b9f4ee..a6578c4 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/SysOrgMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysOrgMapper.java @@ -1,11 +1,10 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.rzyc.bean.bigdata.AreaInfo; import com.rzyc.bean.organization.vo.CountByOrg; -import com.rzyc.model.SysOrg; -import com.rzyc.model.SysOrgExample; -import com.rzyc.model.oth.Manual; +import com.rzyc.model.sys.SysOrg; +import com.rzyc.model.sys.SysOrgExample; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/SysRoleMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysRoleMapper.java similarity index 91% rename from inventory-dao/src/main/java/com/rzyc/mapper/SysRoleMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/sys/SysRoleMapper.java index 3fa014a..3a7a199 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/SysRoleMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysRoleMapper.java @@ -1,7 +1,7 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.sys; -import com.rzyc.model.SysRole; -import com.rzyc.model.SysRoleExample; +import com.rzyc.model.sys.SysRole; +import com.rzyc.model.sys.SysRoleExample; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/SysRoleResourceMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysRoleResourceMapper.java similarity index 87% rename from inventory-dao/src/main/java/com/rzyc/mapper/SysRoleResourceMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/sys/SysRoleResourceMapper.java index 6dd6341..956b08f 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/SysRoleResourceMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysRoleResourceMapper.java @@ -1,7 +1,7 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.sys; -import com.rzyc.model.SysRoleResource; -import com.rzyc.model.SysRoleResourceExample; +import com.rzyc.model.sys.SysRoleResource; +import com.rzyc.model.sys.SysRoleResourceExample; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/SysStatuteDescMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysStatuteDescMapper.java similarity index 90% rename from inventory-dao/src/main/java/com/rzyc/mapper/SysStatuteDescMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/sys/SysStatuteDescMapper.java index b50e1d8..053ac5b 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/SysStatuteDescMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysStatuteDescMapper.java @@ -1,7 +1,7 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.sys; -import com.rzyc.model.SysStatuteDesc; -import com.rzyc.model.SysStatuteDescExample; +import com.rzyc.model.sys.SysStatuteDesc; +import com.rzyc.model.sys.SysStatuteDescExample; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/SysStatuteMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysStatuteMapper.java similarity index 89% rename from inventory-dao/src/main/java/com/rzyc/mapper/SysStatuteMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/sys/SysStatuteMapper.java index cee8b5b..71a6b94 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/SysStatuteMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysStatuteMapper.java @@ -1,7 +1,7 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.sys; -import com.rzyc.model.SysStatute; -import com.rzyc.model.SysStatuteExample; +import com.rzyc.model.sys.SysStatute; +import com.rzyc.model.sys.SysStatuteExample; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/SysUnitTradeMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysUnitTradeMapper.java similarity index 85% rename from inventory-dao/src/main/java/com/rzyc/mapper/SysUnitTradeMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/sys/SysUnitTradeMapper.java index a184f86..19845ff 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/SysUnitTradeMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysUnitTradeMapper.java @@ -1,6 +1,6 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.sys; -import com.rzyc.model.SysUnitTrade; +import com.rzyc.model.sys.SysUnitTrade; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/SysWarningMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysWarningMapper.java similarity index 87% rename from inventory-dao/src/main/java/com/rzyc/mapper/SysWarningMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/sys/SysWarningMapper.java index 1ec1b42..964e39e 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/SysWarningMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysWarningMapper.java @@ -1,6 +1,6 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.sys; -import com.rzyc.model.SysWarning; +import com.rzyc.model.sys.SysWarning; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/SysWarningTypeMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysWarningTypeMapper.java similarity index 80% rename from inventory-dao/src/main/java/com/rzyc/mapper/SysWarningTypeMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/sys/SysWarningTypeMapper.java index d1c4840..fb41607 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/SysWarningTypeMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysWarningTypeMapper.java @@ -1,10 +1,9 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.sys; -import com.rzyc.model.SysWarningType; +import com.rzyc.model.sys.SysWarningType; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import org.springframework.web.bind.annotation.PostMapping; import java.util.List; diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/SysWarningUserMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysWarningUserMapper.java similarity index 90% rename from inventory-dao/src/main/java/com/rzyc/mapper/SysWarningUserMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/sys/SysWarningUserMapper.java index f799b65..4709282 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/SysWarningUserMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysWarningUserMapper.java @@ -1,6 +1,6 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.sys; -import com.rzyc.model.SysWarningUser; +import com.rzyc.model.sys.SysWarningUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/SysdocumentMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysdocumentMapper.java similarity index 88% rename from inventory-dao/src/main/java/com/rzyc/mapper/SysdocumentMapper.java rename to inventory-dao/src/main/java/com/rzyc/mapper/sys/SysdocumentMapper.java index 338ea30..5391121 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/SysdocumentMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/sys/SysdocumentMapper.java @@ -1,7 +1,7 @@ -package com.rzyc.mapper; +package com.rzyc.mapper.sys; -import com.rzyc.model.Sysdocument; -import com.rzyc.model.SysdocumentExample; +import com.rzyc.model.sys.Sysdocument; +import com.rzyc.model.sys.SysdocumentExample; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/user/ListPerformMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/user/ListPerformMapper.java index cbbe787..2664c47 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/user/ListPerformMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/user/ListPerformMapper.java @@ -147,4 +147,7 @@ public interface ListPerformMapper extends BaseMapper { List userPerformInfo(@Param("condition") String condition, @Param("performId") String performId); + /*党政同责部门列表*/ + List findByExamineState(@Param("examineState") Integer examineState); + } diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntCertificates.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntCertificates.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/EntCertificates.java rename to inventory-dao/src/main/java/com/rzyc/model/ent/EntCertificates.java index b4edf6c..286a68e 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntCertificates.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntCertificates.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.ent; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntDevice.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntDevice.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/EntDevice.java rename to inventory-dao/src/main/java/com/rzyc/model/ent/EntDevice.java index dd306b3..147782d 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntDevice.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntDevice.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.ent; import com.baomidou.mybatisplus.annotation.TableName; @@ -10,6 +10,7 @@ import java.io.Serializable; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; +import com.rzyc.model.sys.Sysdocument; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntDeviceInsCycle.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntDeviceInsCycle.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/EntDeviceInsCycle.java rename to inventory-dao/src/main/java/com/rzyc/model/ent/EntDeviceInsCycle.java index 1bf6fbf..dca4cfd 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntDeviceInsCycle.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntDeviceInsCycle.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.ent; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; @@ -13,10 +13,10 @@ import io.swagger.annotations.ApiModelProperty; /** *

- * + * *

* - * @author + * @author * @since 2022-10-21 */ @TableName("ent_device_ins_cycle") diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntDeviceInsStatistic.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntDeviceInsStatistic.java similarity index 96% rename from inventory-dao/src/main/java/com/rzyc/model/EntDeviceInsStatistic.java rename to inventory-dao/src/main/java/com/rzyc/model/ent/EntDeviceInsStatistic.java index ee64bfa..0e14f3b 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntDeviceInsStatistic.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntDeviceInsStatistic.java @@ -1,6 +1,6 @@ -package com.rzyc.model; +package com.rzyc.model.ent; -import com.baomidou.mybatisplus.annotation.TableName; +import com.rzyc.model.sys.Sysdocument; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntDeviceMaintenancePlan.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntDeviceMaintenancePlan.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/EntDeviceMaintenancePlan.java rename to inventory-dao/src/main/java/com/rzyc/model/ent/EntDeviceMaintenancePlan.java index f81b858..5782477 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntDeviceMaintenancePlan.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntDeviceMaintenancePlan.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.ent; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; @@ -12,10 +12,10 @@ import io.swagger.annotations.ApiModelProperty; /** *

- * + * *

* - * @author + * @author * @since 2022-10-21 */ @TableName("ent_device_maintenance_plan") diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntDeviceMaintenanceRecord.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntDeviceMaintenanceRecord.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/EntDeviceMaintenanceRecord.java rename to inventory-dao/src/main/java/com/rzyc/model/ent/EntDeviceMaintenanceRecord.java index e99bbe1..8f45dc8 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntDeviceMaintenanceRecord.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntDeviceMaintenanceRecord.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.ent; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.TableName; @@ -12,10 +12,10 @@ import io.swagger.annotations.ApiModelProperty; /** *

- * + * *

* - * @author + * @author * @since 2022-10-25 */ @TableName("ent_device_maintenance_record") diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntDeviceType.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntDeviceType.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/EntDeviceType.java rename to inventory-dao/src/main/java/com/rzyc/model/ent/EntDeviceType.java index 9bf70d5..97524ff 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntDeviceType.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntDeviceType.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.ent; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; @@ -15,7 +15,7 @@ import io.swagger.annotations.ApiModelProperty; * 设备分类 *

* - * @author + * @author * @since 2022-10-18 */ @TableName("ent_device_type") diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntEmEquipment.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntEmEquipment.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/EntEmEquipment.java rename to inventory-dao/src/main/java/com/rzyc/model/ent/EntEmEquipment.java index d4514f7..0998af7 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntEmEquipment.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntEmEquipment.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.ent; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; @@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty; * 企业应急资源表 *

* - * @author + * @author * @since 2022-11-09 */ @TableName("ent_em_equipment") diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntEmExpert.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntEmExpert.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/EntEmExpert.java rename to inventory-dao/src/main/java/com/rzyc/model/ent/EntEmExpert.java index 931778c..683af5c 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntEmExpert.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntEmExpert.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.ent; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; @@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty; * 企业应急专家 *

* - * @author + * @author * @since 2022-11-09 */ @TableName("ent_em_expert") diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntEmRehearsal.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntEmRehearsal.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/EntEmRehearsal.java rename to inventory-dao/src/main/java/com/rzyc/model/ent/EntEmRehearsal.java index 01b38bc..c78e6a2 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntEmRehearsal.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntEmRehearsal.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.ent; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; @@ -15,7 +15,7 @@ import io.swagger.annotations.ApiModelProperty; * 应急演练 *

* - * @author + * @author * @since 2022-11-09 */ @TableName("ent_em_rehearsal") diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntEmReservePlan.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntEmReservePlan.java similarity index 98% rename from inventory-dao/src/main/java/com/rzyc/model/EntEmReservePlan.java rename to inventory-dao/src/main/java/com/rzyc/model/ent/EntEmReservePlan.java index 0346b74..ea843b7 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntEmReservePlan.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntEmReservePlan.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.ent; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; @@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty; * 企业应急预警 *

* - * @author + * @author * @since 2022-11-09 */ @TableName("ent_em_reserve_plan") diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntInsRecord.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntInsRecord.java similarity index 98% rename from inventory-dao/src/main/java/com/rzyc/model/EntInsRecord.java rename to inventory-dao/src/main/java/com/rzyc/model/ent/EntInsRecord.java index c15f114..c2e6044 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntInsRecord.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntInsRecord.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.ent; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; @@ -7,15 +7,16 @@ import java.io.Serializable; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; +import com.rzyc.model.sys.Sysdocument; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; /** *

- * + * *

* - * @author + * @author * @since 2022-10-21 */ @TableName("ent_ins_record") diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntInspectionRecord.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntInspectionRecord.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/EntInspectionRecord.java rename to inventory-dao/src/main/java/com/rzyc/model/ent/EntInspectionRecord.java index a5c6fc3..9aec229 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntInspectionRecord.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntInspectionRecord.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.ent; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; @@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty; * 送检记录 *

* - * @author + * @author * @since 2022-10-27 */ @TableName("ent_inspection_record") diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntOperatingInstruction.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntOperatingInstruction.java similarity index 98% rename from inventory-dao/src/main/java/com/rzyc/model/EntOperatingInstruction.java rename to inventory-dao/src/main/java/com/rzyc/model/ent/EntOperatingInstruction.java index f855f7b..51cc3bd 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntOperatingInstruction.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntOperatingInstruction.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.ent; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; @@ -12,7 +12,7 @@ import io.swagger.annotations.ApiModelProperty; * 操作规程 *

* - * @author + * @author * @since 2022-10-28 */ @TableName("ent_operating_instruction") diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntPostDuty.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntPostDuty.java similarity index 98% rename from inventory-dao/src/main/java/com/rzyc/model/EntPostDuty.java rename to inventory-dao/src/main/java/com/rzyc/model/ent/EntPostDuty.java index 1a064f7..9f5e234 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntPostDuty.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntPostDuty.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.ent; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; @@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty; * 岗位职责 *

* - * @author + * @author * @since 2022-10-09 */ @TableName("ent_post_duty") diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntPostList.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntPostList.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/EntPostList.java rename to inventory-dao/src/main/java/com/rzyc/model/ent/EntPostList.java index 085a4c2..6d71869 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntPostList.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntPostList.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.ent; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; @@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty; * 工作要务清单 *

* - * @author + * @author * @since 2022-10-08 */ @TableName("ent_post_list") diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntPostListDetail.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntPostListDetail.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/EntPostListDetail.java rename to inventory-dao/src/main/java/com/rzyc/model/ent/EntPostListDetail.java index 57b3e54..61df169 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntPostListDetail.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntPostListDetail.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.ent; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; @@ -16,7 +16,7 @@ import io.swagger.annotations.ApiModelProperty; *

* - * @author + * @author * @since 2022-12-08 */ @TableName("ent_post_list_detail") diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntPostTask.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntPostTask.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/EntPostTask.java rename to inventory-dao/src/main/java/com/rzyc/model/ent/EntPostTask.java index 503159a..8f1db1a 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntPostTask.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntPostTask.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.ent; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; @@ -10,10 +10,10 @@ import io.swagger.annotations.ApiModelProperty; /** *

- * + * *

* - * @author + * @author * @since 2022-10-09 */ @TableName("ent_post_task") diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntPostTaskStatistic.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntPostTaskStatistic.java similarity index 96% rename from inventory-dao/src/main/java/com/rzyc/model/EntPostTaskStatistic.java rename to inventory-dao/src/main/java/com/rzyc/model/ent/EntPostTaskStatistic.java index b581ec7..b7d53e0 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntPostTaskStatistic.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntPostTaskStatistic.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.ent; /** * 企业岗位任务履职统计 diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntRepairPlan.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntRepairPlan.java similarity index 98% rename from inventory-dao/src/main/java/com/rzyc/model/EntRepairPlan.java rename to inventory-dao/src/main/java/com/rzyc/model/ent/EntRepairPlan.java index 4621d2e..76516ff 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntRepairPlan.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntRepairPlan.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.ent; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; @@ -10,10 +10,10 @@ import io.swagger.annotations.ApiModelProperty; /** *

- * + * *

* - * @author + * @author * @since 2022-10-27 */ @TableName("ent_repair_plan") diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntRepairRecord.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntRepairRecord.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/EntRepairRecord.java rename to inventory-dao/src/main/java/com/rzyc/model/ent/EntRepairRecord.java index c449e60..445df61 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntRepairRecord.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntRepairRecord.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.ent; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.TableName; @@ -9,15 +9,16 @@ import java.io.Serializable; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; +import com.rzyc.model.sys.Sysdocument; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; /** *

- * + * *

* - * @author + * @author * @since 2022-10-28 */ @TableName("ent_repair_record") diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntReportRepair.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntReportRepair.java similarity index 98% rename from inventory-dao/src/main/java/com/rzyc/model/EntReportRepair.java rename to inventory-dao/src/main/java/com/rzyc/model/ent/EntReportRepair.java index 7261f63..343389e 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntReportRepair.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntReportRepair.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.ent; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; @@ -10,10 +10,10 @@ import io.swagger.annotations.ApiModelProperty; /** *

- * + * *

* - * @author + * @author * @since 2022-10-28 */ @TableName("ent_report_repair") diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntUserCredential.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntUserCredential.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/EntUserCredential.java rename to inventory-dao/src/main/java/com/rzyc/model/ent/EntUserCredential.java index ed07aab..03c8bab 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntUserCredential.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntUserCredential.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.ent; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; @@ -12,10 +12,10 @@ import io.swagger.annotations.ApiModelProperty; /** *

- * + * *

* - * @author + * @author * @since 2022-10-09 */ @TableName("ent_user_credential") diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntUserType.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntUserType.java similarity index 97% rename from inventory-dao/src/main/java/com/rzyc/model/EntUserType.java rename to inventory-dao/src/main/java/com/rzyc/model/ent/EntUserType.java index 31e1b3d..c8c8c69 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntUserType.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntUserType.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.ent; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; @@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty; * 人员类型 *

* - * @author + * @author * @since 2022-11-08 */ @TableName("ent_user_type") diff --git a/inventory-dao/src/main/java/com/rzyc/model/ex/ExExamine.java b/inventory-dao/src/main/java/com/rzyc/model/ex/ExExamine.java new file mode 100644 index 0000000..b76e1b0 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/model/ex/ExExamine.java @@ -0,0 +1,169 @@ +package com.rzyc.model.ex; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *

+ * 党政同责考核 + *

+ * + * @author + * @since 2024-04-01 + */ +@TableName("ex_examine") +@ApiModel(value="ExExamine对象", description="党政同责考核") +public class ExExamine implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "考核id") + @TableId("examine_id") + private String examineId; + + @ApiModelProperty(value = "考核标题") + @TableField("title") + private String title; + + @ApiModelProperty(value = "年份") + @TableField("year_num") + private String yearNum; + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "上传资料开始时间") + @TableField("start_time") + private Date startTime; + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "上传资料结束时间") + @TableField("end_time") + private Date endTime; + + @ApiModelProperty(value = "状态 1、审核中 2、已发布 3、上传资料 4、评分中 5、评分完成") + @TableField("state") + private Integer state; + + @ApiModelProperty(value = "删除状态 1：正常 2:已删除") + @TableField("del_state") + private Integer delState; + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + @ApiModelProperty(value = "创建人") + @TableField("create_by") + private String createBy; + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "修改时间") + @TableField("modify_time") + private Date modifyTime; + + @ApiModelProperty(value = "修改人") + @TableField("modify_by") + private String modifyBy; + + public String getExamineId() { + return examineId; + } + + public void setExamineId(String examineId) { + this.examineId = examineId; + } + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + public String getYearNum() { + return yearNum; + } + + public void setYearNum(String yearNum) { + this.yearNum = yearNum; + } + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + public Integer getState() { + return state; + } + + public void setState(Integer state) { + this.state = state; + } + public Integer getDelState() { + return delState; + } + + public void setDelState(Integer delState) { + this.delState = delState; + } + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + public String getModifyBy() { + return modifyBy; + } + + public void setModifyBy(String modifyBy) { + this.modifyBy = modifyBy; + } + + @Override + public String toString() { + return "ExExamine{" + + "examineId=" + examineId + + ", title=" + title + + ", yearNum=" + yearNum + + ", startTime=" + startTime + + ", endTime=" + endTime + + ", state=" + state + + ", delState=" + delState + + ", createTime=" + createTime + + ", createBy=" + createBy + + ", modifyTime=" + modifyTime + + ", modifyBy=" + modifyBy + + "}"; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/model/ex/ExExamineItem.java b/inventory-dao/src/main/java/com/rzyc/model/ex/ExExamineItem.java new file mode 100644 index 0000000..9390fb3 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/model/ex/ExExamineItem.java @@ -0,0 +1,187 @@ +package com.rzyc.model.ex; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *

+ * 考核项 + *

+ * + * @author + * @since 2024-04-01 + */ +@TableName("ex_examine_item") +@ApiModel(value="ExExamineItem对象", description="考核项") +public class ExExamineItem implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "考核项id") + @TableId("item_id") + private String itemId; + + @ApiModelProperty(value = "考核id") + @TableField("examine_id") + private String examineId; + + @ApiModelProperty(value = "考核项") + @TableField("title") + private String title; + + @ApiModelProperty(value = "考核项分数") + @TableField("item_score") + private Double itemScore; + + @ApiModelProperty(value = "上级考核项id") + @TableField("parent_id") + private String parentId; + + @ApiModelProperty(value = "考核项路径") + @TableField("parent_path") + private String parentPath; + + @ApiModelProperty(value = "考核项类型 1、普通 2、个性 3、加分项") + @TableField("item_type") + private Integer itemType; + + @ApiModelProperty(value = "排序") + @TableField("sort_id") + private Integer sortId; + + @ApiModelProperty(value = "删除状态 1：正常 2:已删除") + @TableField("del_state") + private Integer delState; + + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + @ApiModelProperty(value = "创建人") + @TableField("create_by") + private String createBy; + + @ApiModelProperty(value = "修改时间") + @TableField("modify_time") + private Date modifyTime; + + @ApiModelProperty(value = "修改人") + @TableField("modify_by") + private String modifyBy; + + public String getExamineId() { + return examineId; + } + + public void setExamineId(String examineId) { + this.examineId = examineId; + } + + public String getItemId() { + return itemId; + } + + public void setItemId(String itemId) { + this.itemId = itemId; + } + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + public Double getItemScore() { + return itemScore; + } + + public void setItemScore(Double itemScore) { + this.itemScore = itemScore; + } + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + public String getParentPath() { + return parentPath; + } + + public void setParentPath(String parentPath) { + this.parentPath = parentPath; + } + public Integer getItemType() { + return itemType; + } + + public void setItemType(Integer itemType) { + this.itemType = itemType; + } + public Integer getSortId() { + return sortId; + } + + public void setSortId(Integer sortId) { + this.sortId = sortId; + } + public Integer getDelState() { + return delState; + } + + public void setDelState(Integer delState) { + this.delState = delState; + } + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + public String getModifyBy() { + return modifyBy; + } + + public void setModifyBy(String modifyBy) { + this.modifyBy = modifyBy; + } + + @Override + public String toString() { + return "ExExamineItem{" + + "itemId=" + itemId + + ", title=" + title + + ", itemScore=" + itemScore + + ", parentId=" + parentId + + ", parentPath=" + parentPath + + ", itemType=" + itemType + + ", sortId=" + sortId + + ", delState=" + delState + + ", createTime=" + createTime + + ", createBy=" + createBy + + ", modifyTime=" + modifyTime + + ", modifyBy=" + modifyBy + + "}"; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/model/ex/ExStandard.java b/inventory-dao/src/main/java/com/rzyc/model/ex/ExStandard.java new file mode 100644 index 0000000..6e78f46 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/model/ex/ExStandard.java @@ -0,0 +1,211 @@ +package com.rzyc.model.ex; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *

+ * 评分标准 + *

+ * + * @author + * @since 2024-04-01 + */ +@TableName("ex_standard") +@ApiModel(value="ExStandard对象", description="评分标准") +public class ExStandard implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "评分标准id") + @TableId("standard_id") + private String standardId; + + @ApiModelProperty(value = "考核id") + @TableField("examine_id") + private String examineId; + + @ApiModelProperty(value = "评分标准") + @TableField("title") + private String title; + + @ApiModelProperty(value = "分数") + @TableField("score") + private Double score; + + @ApiModelProperty(value = "考核项id") + @TableField("item_id") + private String itemId; + + @ApiModelProperty(value = "考核项路径") + @TableField("item_path") + private String itemPath; + + @ApiModelProperty(value = "部门id 个性清单时选择") + @TableField("perform_id") + private String performId; + + @ApiModelProperty(value = "党政同责考核类型 1、负有安全生产监管职责的部门 2、其他有关部门 3、属地") + @TableField("examine_state") + private Integer examineState; + + @ApiModelProperty(value = "考核项类型 1、普通 2、个性 3、加分项") + @TableField("item_type") + private Integer itemType; + + @ApiModelProperty(value = "排序") + @TableField("sort_id") + private Integer sortId; + + @ApiModelProperty(value = "删除状态 1：正常 2:已删除") + @TableField("del_state") + private Integer delState; + + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + @ApiModelProperty(value = "创建人") + @TableField("create_by") + private String createBy; + + @ApiModelProperty(value = "修改时间") + @TableField("modify_time") + private Date modifyTime; + + @ApiModelProperty(value = "修改人") + @TableField("modify_by") + private String modifyBy; + + public String getExamineId() { + return examineId; + } + + public void setExamineId(String examineId) { + this.examineId = examineId; + } + + public String getStandardId() { + return standardId; + } + + public void setStandardId(String standardId) { + this.standardId = standardId; + } + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + public Double getScore() { + return score; + } + + public void setScore(Double score) { + this.score = score; + } + public String getItemId() { + return itemId; + } + + public void setItemId(String itemId) { + this.itemId = itemId; + } + public String getItemPath() { + return itemPath; + } + + public void setItemPath(String itemPath) { + this.itemPath = itemPath; + } + public String getPerformId() { + return performId; + } + + public void setPerformId(String performId) { + this.performId = performId; + } + public Integer getExamineState() { + return examineState; + } + + public void setExamineState(Integer examineState) { + this.examineState = examineState; + } + public Integer getItemType() { + return itemType; + } + + public void setItemType(Integer itemType) { + this.itemType = itemType; + } + public Integer getSortId() { + return sortId; + } + + public void setSortId(Integer sortId) { + this.sortId = sortId; + } + public Integer getDelState() { + return delState; + } + + public void setDelState(Integer delState) { + this.delState = delState; + } + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + public String getModifyBy() { + return modifyBy; + } + + public void setModifyBy(String modifyBy) { + this.modifyBy = modifyBy; + } + + @Override + public String toString() { + return "ExStandard{" + + "standardId=" + standardId + + ", title=" + title + + ", score=" + score + + ", itemId=" + itemId + + ", itemPath=" + itemPath + + ", performId=" + performId + + ", examineState=" + examineState + + ", itemType=" + itemType + + ", sortId=" + sortId + + ", delState=" + delState + + ", createTime=" + createTime + + ", createBy=" + createBy + + ", modifyTime=" + modifyTime + + ", modifyBy=" + modifyBy + + "}"; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysCode.java b/inventory-dao/src/main/java/com/rzyc/model/sys/SysCode.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/SysCode.java rename to inventory-dao/src/main/java/com/rzyc/model/sys/SysCode.java index c36f6ac..f56602f 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/SysCode.java +++ b/inventory-dao/src/main/java/com/rzyc/model/sys/SysCode.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.sys; import java.io.Serializable; import java.util.Date; diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysCodeExample.java b/inventory-dao/src/main/java/com/rzyc/model/sys/SysCodeExample.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/SysCodeExample.java rename to inventory-dao/src/main/java/com/rzyc/model/sys/SysCodeExample.java index 48cb61e..b10de8b 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/SysCodeExample.java +++ b/inventory-dao/src/main/java/com/rzyc/model/sys/SysCodeExample.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.sys; import java.util.ArrayList; import java.util.Date; diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysDocumenttemp.java b/inventory-dao/src/main/java/com/rzyc/model/sys/SysDocumenttemp.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/SysDocumenttemp.java rename to inventory-dao/src/main/java/com/rzyc/model/sys/SysDocumenttemp.java index e3bcd01..290da50 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/SysDocumenttemp.java +++ b/inventory-dao/src/main/java/com/rzyc/model/sys/SysDocumenttemp.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.sys; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysLogAuth.java b/inventory-dao/src/main/java/com/rzyc/model/sys/SysLogAuth.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/SysLogAuth.java rename to inventory-dao/src/main/java/com/rzyc/model/sys/SysLogAuth.java index a4c1eb1..bd7ba54 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/SysLogAuth.java +++ b/inventory-dao/src/main/java/com/rzyc/model/sys/SysLogAuth.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.sys; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysLogAuthExample.java b/inventory-dao/src/main/java/com/rzyc/model/sys/SysLogAuthExample.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/SysLogAuthExample.java rename to inventory-dao/src/main/java/com/rzyc/model/sys/SysLogAuthExample.java index 71b6ff0..87fd5de 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/SysLogAuthExample.java +++ b/inventory-dao/src/main/java/com/rzyc/model/sys/SysLogAuthExample.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.sys; import java.util.ArrayList; import java.util.Date; diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysLogOpt.java b/inventory-dao/src/main/java/com/rzyc/model/sys/SysLogOpt.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/SysLogOpt.java rename to inventory-dao/src/main/java/com/rzyc/model/sys/SysLogOpt.java index d4472e4..07de725 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/SysLogOpt.java +++ b/inventory-dao/src/main/java/com/rzyc/model/sys/SysLogOpt.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.sys; import java.io.Serializable; import java.util.Date; diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysLogOptExample.java b/inventory-dao/src/main/java/com/rzyc/model/sys/SysLogOptExample.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/SysLogOptExample.java rename to inventory-dao/src/main/java/com/rzyc/model/sys/SysLogOptExample.java index 034ebf4..37787a4 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/SysLogOptExample.java +++ b/inventory-dao/src/main/java/com/rzyc/model/sys/SysLogOptExample.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.sys; import java.util.ArrayList; import java.util.Date; diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysLogOptWithBLOBs.java b/inventory-dao/src/main/java/com/rzyc/model/sys/SysLogOptWithBLOBs.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/SysLogOptWithBLOBs.java rename to inventory-dao/src/main/java/com/rzyc/model/sys/SysLogOptWithBLOBs.java index 17873db..094e0a3 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/SysLogOptWithBLOBs.java +++ b/inventory-dao/src/main/java/com/rzyc/model/sys/SysLogOptWithBLOBs.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.sys; import java.io.Serializable; diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysOrg.java b/inventory-dao/src/main/java/com/rzyc/model/sys/SysOrg.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/SysOrg.java rename to inventory-dao/src/main/java/com/rzyc/model/sys/SysOrg.java index 1c1fe61..c18ccbe 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/SysOrg.java +++ b/inventory-dao/src/main/java/com/rzyc/model/sys/SysOrg.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.sys; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysOrgExample.java b/inventory-dao/src/main/java/com/rzyc/model/sys/SysOrgExample.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/SysOrgExample.java rename to inventory-dao/src/main/java/com/rzyc/model/sys/SysOrgExample.java index 1981e21..9f3a703 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/SysOrgExample.java +++ b/inventory-dao/src/main/java/com/rzyc/model/sys/SysOrgExample.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.sys; import java.util.ArrayList; import java.util.Date; diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysRole.java b/inventory-dao/src/main/java/com/rzyc/model/sys/SysRole.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/SysRole.java rename to inventory-dao/src/main/java/com/rzyc/model/sys/SysRole.java index 0297b7d..3d206e9 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/SysRole.java +++ b/inventory-dao/src/main/java/com/rzyc/model/sys/SysRole.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.sys; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysRoleExample.java b/inventory-dao/src/main/java/com/rzyc/model/sys/SysRoleExample.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/SysRoleExample.java rename to inventory-dao/src/main/java/com/rzyc/model/sys/SysRoleExample.java index f53feea..7030ee5 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/SysRoleExample.java +++ b/inventory-dao/src/main/java/com/rzyc/model/sys/SysRoleExample.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.sys; import java.util.ArrayList; import java.util.Date; diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysRoleResource.java b/inventory-dao/src/main/java/com/rzyc/model/sys/SysRoleResource.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/SysRoleResource.java rename to inventory-dao/src/main/java/com/rzyc/model/sys/SysRoleResource.java index 7269858..5d1e209 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/SysRoleResource.java +++ b/inventory-dao/src/main/java/com/rzyc/model/sys/SysRoleResource.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.sys; import java.io.Serializable; import java.util.Date; diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysRoleResourceExample.java b/inventory-dao/src/main/java/com/rzyc/model/sys/SysRoleResourceExample.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/SysRoleResourceExample.java rename to inventory-dao/src/main/java/com/rzyc/model/sys/SysRoleResourceExample.java index d3282bb..90a4beb 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/SysRoleResourceExample.java +++ b/inventory-dao/src/main/java/com/rzyc/model/sys/SysRoleResourceExample.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.sys; import java.util.ArrayList; import java.util.Date; diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysStatute.java b/inventory-dao/src/main/java/com/rzyc/model/sys/SysStatute.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/SysStatute.java rename to inventory-dao/src/main/java/com/rzyc/model/sys/SysStatute.java index ee1fa98..45f54cd 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/SysStatute.java +++ b/inventory-dao/src/main/java/com/rzyc/model/sys/SysStatute.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.sys; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysStatuteDesc.java b/inventory-dao/src/main/java/com/rzyc/model/sys/SysStatuteDesc.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/SysStatuteDesc.java rename to inventory-dao/src/main/java/com/rzyc/model/sys/SysStatuteDesc.java index 4148c53..1bcd922 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/SysStatuteDesc.java +++ b/inventory-dao/src/main/java/com/rzyc/model/sys/SysStatuteDesc.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.sys; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysStatuteDescExample.java b/inventory-dao/src/main/java/com/rzyc/model/sys/SysStatuteDescExample.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/SysStatuteDescExample.java rename to inventory-dao/src/main/java/com/rzyc/model/sys/SysStatuteDescExample.java index bfe9682..492db32 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/SysStatuteDescExample.java +++ b/inventory-dao/src/main/java/com/rzyc/model/sys/SysStatuteDescExample.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.sys; import java.util.ArrayList; import java.util.Date; diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysStatuteExample.java b/inventory-dao/src/main/java/com/rzyc/model/sys/SysStatuteExample.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/SysStatuteExample.java rename to inventory-dao/src/main/java/com/rzyc/model/sys/SysStatuteExample.java index bfaf89a..fd023b3 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/SysStatuteExample.java +++ b/inventory-dao/src/main/java/com/rzyc/model/sys/SysStatuteExample.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.sys; import java.util.ArrayList; import java.util.Date; diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysUnitTrade.java b/inventory-dao/src/main/java/com/rzyc/model/sys/SysUnitTrade.java similarity index 98% rename from inventory-dao/src/main/java/com/rzyc/model/SysUnitTrade.java rename to inventory-dao/src/main/java/com/rzyc/model/sys/SysUnitTrade.java index f648c3e..226efb9 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/SysUnitTrade.java +++ b/inventory-dao/src/main/java/com/rzyc/model/sys/SysUnitTrade.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.sys; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; @@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty; * 部门行业监管 *

* - * @author + * @author * @since 2023-03-31 */ @TableName("sys_unit_trade") diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysWarning.java b/inventory-dao/src/main/java/com/rzyc/model/sys/SysWarning.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/SysWarning.java rename to inventory-dao/src/main/java/com/rzyc/model/sys/SysWarning.java index e00c1ed..295e73b 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/SysWarning.java +++ b/inventory-dao/src/main/java/com/rzyc/model/sys/SysWarning.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.sys; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysWarningType.java b/inventory-dao/src/main/java/com/rzyc/model/sys/SysWarningType.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/SysWarningType.java rename to inventory-dao/src/main/java/com/rzyc/model/sys/SysWarningType.java index 4ae46b8..98e1664 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/SysWarningType.java +++ b/inventory-dao/src/main/java/com/rzyc/model/sys/SysWarningType.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.sys; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysWarningUser.java b/inventory-dao/src/main/java/com/rzyc/model/sys/SysWarningUser.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/SysWarningUser.java rename to inventory-dao/src/main/java/com/rzyc/model/sys/SysWarningUser.java index 6d13643..52a37f3 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/SysWarningUser.java +++ b/inventory-dao/src/main/java/com/rzyc/model/sys/SysWarningUser.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.sys; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; diff --git a/inventory-dao/src/main/java/com/rzyc/model/Sysdocument.java b/inventory-dao/src/main/java/com/rzyc/model/sys/Sysdocument.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/Sysdocument.java rename to inventory-dao/src/main/java/com/rzyc/model/sys/Sysdocument.java index 2fad198..aab31be 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/Sysdocument.java +++ b/inventory-dao/src/main/java/com/rzyc/model/sys/Sysdocument.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.sys; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysdocumentExample.java b/inventory-dao/src/main/java/com/rzyc/model/sys/SysdocumentExample.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/SysdocumentExample.java rename to inventory-dao/src/main/java/com/rzyc/model/sys/SysdocumentExample.java index d0aed24..7f7d4b7 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/SysdocumentExample.java +++ b/inventory-dao/src/main/java/com/rzyc/model/sys/SysdocumentExample.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.sys; import java.util.ArrayList; import java.util.Date; diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysdocumentWithBLOBs.java b/inventory-dao/src/main/java/com/rzyc/model/sys/SysdocumentWithBLOBs.java similarity index 99% rename from inventory-dao/src/main/java/com/rzyc/model/SysdocumentWithBLOBs.java rename to inventory-dao/src/main/java/com/rzyc/model/sys/SysdocumentWithBLOBs.java index ac0d6a9..55b67a9 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/SysdocumentWithBLOBs.java +++ b/inventory-dao/src/main/java/com/rzyc/model/sys/SysdocumentWithBLOBs.java @@ -1,4 +1,4 @@ -package com.rzyc.model; +package com.rzyc.model.sys; import java.io.Serializable; diff --git a/inventory-dao/src/main/java/com/rzyc/model/user/ListPerform.java b/inventory-dao/src/main/java/com/rzyc/model/user/ListPerform.java index b98b0cd..98243d9 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/user/ListPerform.java +++ b/inventory-dao/src/main/java/com/rzyc/model/user/ListPerform.java @@ -123,6 +123,10 @@ public class ListPerform implements Serializable { @TableField("position_type") private Integer positionType; + @ApiModelProperty("党政同责考核类型 1、负有安全生产监管职责的部门 2、其他有关部门 3、属地") + @TableField("examine_state") + private Integer examineState; + private static final long serialVersionUID = 1L; public String getAreaCode() { diff --git a/inventory-dao/src/main/resources/mapper/EntCertificatesMapper.xml b/inventory-dao/src/main/resources/mapper/ent/EntCertificatesMapper.xml similarity index 94% rename from inventory-dao/src/main/resources/mapper/EntCertificatesMapper.xml rename to inventory-dao/src/main/resources/mapper/ent/EntCertificatesMapper.xml index fbc000b..036e35e 100644 --- a/inventory-dao/src/main/resources/mapper/EntCertificatesMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/EntCertificatesMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/inventory-dao/src/main/resources/mapper/EntDeviceInsCycleMapper.xml b/inventory-dao/src/main/resources/mapper/ent/EntDeviceInsCycleMapper.xml similarity index 96% rename from inventory-dao/src/main/resources/mapper/EntDeviceInsCycleMapper.xml rename to inventory-dao/src/main/resources/mapper/ent/EntDeviceInsCycleMapper.xml index df06e40..bf25a5b 100644 --- a/inventory-dao/src/main/resources/mapper/EntDeviceInsCycleMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/EntDeviceInsCycleMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/inventory-dao/src/main/resources/mapper/EntDeviceMaintenancePlanMapper.xml b/inventory-dao/src/main/resources/mapper/ent/EntDeviceMaintenancePlanMapper.xml similarity index 94% rename from inventory-dao/src/main/resources/mapper/EntDeviceMaintenancePlanMapper.xml rename to inventory-dao/src/main/resources/mapper/ent/EntDeviceMaintenancePlanMapper.xml index 7246a0f..785b22e 100644 --- a/inventory-dao/src/main/resources/mapper/EntDeviceMaintenancePlanMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/EntDeviceMaintenancePlanMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/inventory-dao/src/main/resources/mapper/EntDeviceMaintenanceRecordMapper.xml b/inventory-dao/src/main/resources/mapper/ent/EntDeviceMaintenanceRecordMapper.xml similarity index 95% rename from inventory-dao/src/main/resources/mapper/EntDeviceMaintenanceRecordMapper.xml rename to inventory-dao/src/main/resources/mapper/ent/EntDeviceMaintenanceRecordMapper.xml index 51b4f46..25fbb83 100644 --- a/inventory-dao/src/main/resources/mapper/EntDeviceMaintenanceRecordMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/EntDeviceMaintenanceRecordMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/inventory-dao/src/main/resources/mapper/EntDeviceMapper.xml b/inventory-dao/src/main/resources/mapper/ent/EntDeviceMapper.xml similarity index 94% rename from inventory-dao/src/main/resources/mapper/EntDeviceMapper.xml rename to inventory-dao/src/main/resources/mapper/ent/EntDeviceMapper.xml index 8cc9dca..3171fe8 100644 --- a/inventory-dao/src/main/resources/mapper/EntDeviceMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/EntDeviceMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -40,7 +40,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -104,7 +104,7 @@ - + @@ -125,13 +125,13 @@ - + - + @@ -162,7 +162,7 @@ GROUP BY ed.device_id - + update ent_device set type_path = #{entDevice.typePath},enterprise_id = #{entDevice.enterpriseId},qr_code = #{entDevice.qrCode},installation_time = #{entDevice.installationTime}, enable_time = #{entDevice.enableTime},scrap_time = #{entDevice.scrapTime},factory_number = #{entDevice.factoryNumber},longitude = #{entDevice.longitude},latitude = #{entDevice.latitude}, eq_charge_person = #{entDevice.eqChargePerson},manufacturer = #{entDevice.manufacturer},specific_location = #{entDevice.specificLocation},modify_by = #{entDevice.modifyBy},modify_time = #{entDevice.modifyTime} diff --git a/inventory-dao/src/main/resources/mapper/EntDeviceTypeMapper.xml b/inventory-dao/src/main/resources/mapper/ent/EntDeviceTypeMapper.xml similarity index 94% rename from inventory-dao/src/main/resources/mapper/EntDeviceTypeMapper.xml rename to inventory-dao/src/main/resources/mapper/ent/EntDeviceTypeMapper.xml index 60e17f6..a30951b 100644 --- a/inventory-dao/src/main/resources/mapper/EntDeviceTypeMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/EntDeviceTypeMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/inventory-dao/src/main/resources/mapper/EntEmEquipmentMapper.xml b/inventory-dao/src/main/resources/mapper/ent/EntEmEquipmentMapper.xml similarity index 93% rename from inventory-dao/src/main/resources/mapper/EntEmEquipmentMapper.xml rename to inventory-dao/src/main/resources/mapper/ent/EntEmEquipmentMapper.xml index 3951ace..13a13d3 100644 --- a/inventory-dao/src/main/resources/mapper/EntEmEquipmentMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/EntEmEquipmentMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/inventory-dao/src/main/resources/mapper/EntEmExpertMapper.xml b/inventory-dao/src/main/resources/mapper/ent/EntEmExpertMapper.xml similarity index 95% rename from inventory-dao/src/main/resources/mapper/EntEmExpertMapper.xml rename to inventory-dao/src/main/resources/mapper/ent/EntEmExpertMapper.xml index 230f790..a45ae54 100644 --- a/inventory-dao/src/main/resources/mapper/EntEmExpertMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/EntEmExpertMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/inventory-dao/src/main/resources/mapper/EntEmRehearsalMapper.xml b/inventory-dao/src/main/resources/mapper/ent/EntEmRehearsalMapper.xml similarity index 93% rename from inventory-dao/src/main/resources/mapper/EntEmRehearsalMapper.xml rename to inventory-dao/src/main/resources/mapper/ent/EntEmRehearsalMapper.xml index 43e224f..3f33ced 100644 --- a/inventory-dao/src/main/resources/mapper/EntEmRehearsalMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/EntEmRehearsalMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/inventory-dao/src/main/resources/mapper/EntEmReservePlanMapper.xml b/inventory-dao/src/main/resources/mapper/ent/EntEmReservePlanMapper.xml similarity index 92% rename from inventory-dao/src/main/resources/mapper/EntEmReservePlanMapper.xml rename to inventory-dao/src/main/resources/mapper/ent/EntEmReservePlanMapper.xml index bb38e0c..0a19355 100644 --- a/inventory-dao/src/main/resources/mapper/EntEmReservePlanMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/EntEmReservePlanMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/inventory-dao/src/main/resources/mapper/EntInsRecordMapper.xml b/inventory-dao/src/main/resources/mapper/ent/EntInsRecordMapper.xml similarity index 95% rename from inventory-dao/src/main/resources/mapper/EntInsRecordMapper.xml rename to inventory-dao/src/main/resources/mapper/ent/EntInsRecordMapper.xml index 9809037..536bb45 100644 --- a/inventory-dao/src/main/resources/mapper/EntInsRecordMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/EntInsRecordMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -30,7 +30,7 @@ device_id = #{entInsRecord.deviceId},spare_part_id = #{entInsRecord.spare_part_id} ,cycle_id = #{entInsRecord.cycleId} where ins_record_id = #{insRecordId} - + @@ -44,7 +44,7 @@ - + diff --git a/inventory-dao/src/main/resources/mapper/EntInspectionRecordMapper.xml b/inventory-dao/src/main/resources/mapper/ent/EntInspectionRecordMapper.xml similarity index 94% rename from inventory-dao/src/main/resources/mapper/EntInspectionRecordMapper.xml rename to inventory-dao/src/main/resources/mapper/ent/EntInspectionRecordMapper.xml index ddff198..673b244 100644 --- a/inventory-dao/src/main/resources/mapper/EntInspectionRecordMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/EntInspectionRecordMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/inventory-dao/src/main/resources/mapper/EntOperatingInstructionMapper.xml b/inventory-dao/src/main/resources/mapper/ent/EntOperatingInstructionMapper.xml similarity index 91% rename from inventory-dao/src/main/resources/mapper/EntOperatingInstructionMapper.xml rename to inventory-dao/src/main/resources/mapper/ent/EntOperatingInstructionMapper.xml index 87025cd..92338f3 100644 --- a/inventory-dao/src/main/resources/mapper/EntOperatingInstructionMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/EntOperatingInstructionMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/inventory-dao/src/main/resources/mapper/EntPostDutyMapper.xml b/inventory-dao/src/main/resources/mapper/ent/EntPostDutyMapper.xml similarity index 93% rename from inventory-dao/src/main/resources/mapper/EntPostDutyMapper.xml rename to inventory-dao/src/main/resources/mapper/ent/EntPostDutyMapper.xml index 9121d35..223f226 100644 --- a/inventory-dao/src/main/resources/mapper/EntPostDutyMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/EntPostDutyMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/inventory-dao/src/main/resources/mapper/EntPostListDetailMapper.xml b/inventory-dao/src/main/resources/mapper/ent/EntPostListDetailMapper.xml similarity index 93% rename from inventory-dao/src/main/resources/mapper/EntPostListDetailMapper.xml rename to inventory-dao/src/main/resources/mapper/ent/EntPostListDetailMapper.xml index 026c073..7f99ff3 100644 --- a/inventory-dao/src/main/resources/mapper/EntPostListDetailMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/EntPostListDetailMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/inventory-dao/src/main/resources/mapper/EntPostListMapper.xml b/inventory-dao/src/main/resources/mapper/ent/EntPostListMapper.xml similarity index 96% rename from inventory-dao/src/main/resources/mapper/EntPostListMapper.xml rename to inventory-dao/src/main/resources/mapper/ent/EntPostListMapper.xml index 31018df..b35e90a 100644 --- a/inventory-dao/src/main/resources/mapper/EntPostListMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/EntPostListMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -82,7 +82,7 @@ - + @@ -107,7 +107,7 @@ - select epl.list_id,ipi.in_list as item_title,count(ept.task_id)as totalTaskNumber,sum(case when task_state = 1 then 1 else 0 end)as haveInHand,ep.name postName from ent_post_list epl left join ent_post_task ept on epl.post_list_id = ept.ent_list_id diff --git a/inventory-dao/src/main/resources/mapper/EntPostTaskMapper.xml b/inventory-dao/src/main/resources/mapper/ent/EntPostTaskMapper.xml similarity index 95% rename from inventory-dao/src/main/resources/mapper/EntPostTaskMapper.xml rename to inventory-dao/src/main/resources/mapper/ent/EntPostTaskMapper.xml index 3a8a4aa..0a5936f 100644 --- a/inventory-dao/src/main/resources/mapper/EntPostTaskMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/EntPostTaskMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -87,7 +87,7 @@ - + @@ -145,7 +145,7 @@ - select ept.frequency,count(epld.ListDetailId)as numberOfDutyPerformance from ent_post_task ept left join ent_post_list_detail epld on ept.task_id = epld.ent_post_task_id where ent_post_task_id = #{entPostTaskId} diff --git a/inventory-dao/src/main/resources/mapper/EntRepairPlanMapper.xml b/inventory-dao/src/main/resources/mapper/ent/EntRepairPlanMapper.xml similarity index 93% rename from inventory-dao/src/main/resources/mapper/EntRepairPlanMapper.xml rename to inventory-dao/src/main/resources/mapper/ent/EntRepairPlanMapper.xml index 3e42f97..f2cf987 100644 --- a/inventory-dao/src/main/resources/mapper/EntRepairPlanMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/EntRepairPlanMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/inventory-dao/src/main/resources/mapper/EntRepairRecordMapper.xml b/inventory-dao/src/main/resources/mapper/ent/EntRepairRecordMapper.xml similarity index 96% rename from inventory-dao/src/main/resources/mapper/EntRepairRecordMapper.xml rename to inventory-dao/src/main/resources/mapper/ent/EntRepairRecordMapper.xml index 99f6b72..b35a460 100644 --- a/inventory-dao/src/main/resources/mapper/EntRepairRecordMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/EntRepairRecordMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -26,7 +26,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/inventory-dao/src/main/resources/mapper/EntReportRepairMapper.xml b/inventory-dao/src/main/resources/mapper/ent/EntReportRepairMapper.xml similarity index 93% rename from inventory-dao/src/main/resources/mapper/EntReportRepairMapper.xml rename to inventory-dao/src/main/resources/mapper/ent/EntReportRepairMapper.xml index 3c0aa15..461948a 100644 --- a/inventory-dao/src/main/resources/mapper/EntReportRepairMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/EntReportRepairMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/inventory-dao/src/main/resources/mapper/EntUserCredentialMapper.xml b/inventory-dao/src/main/resources/mapper/ent/EntUserCredentialMapper.xml similarity index 94% rename from inventory-dao/src/main/resources/mapper/EntUserCredentialMapper.xml rename to inventory-dao/src/main/resources/mapper/ent/EntUserCredentialMapper.xml index 635eb53..104da52 100644 --- a/inventory-dao/src/main/resources/mapper/EntUserCredentialMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/EntUserCredentialMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -39,7 +39,7 @@ - + update ent_user_credential set credential_name= #{data.credentialName} ,credential_start_time = #{data.credentialStartTime},credential_state = #{data.credentialState}, credential_end_time = #{data.credentialEndTime},credential_image_address = #{data.credentialImageAddress}, modify_time = #{data.modifyTime} , modify_by = #{data.modifyBy} @@ -52,7 +52,7 @@ ) - + insert into ent_user_credential (credential_id,credential_name,credential_start_time,credential_end_time,credential_image_address,ent_user_id,create_by,create_time,credential_state ) values(#{data.credentialId},#{data.credentialName},#{data.credentialStartTime},#{data.credentialEndTime},#{data.credentialImageAddress},#{data.entUserId},#{data.createBy},#{data.createTime},#{data.credentialState}) diff --git a/inventory-dao/src/main/resources/mapper/EntUserTypeMapper.xml b/inventory-dao/src/main/resources/mapper/ent/EntUserTypeMapper.xml similarity index 81% rename from inventory-dao/src/main/resources/mapper/EntUserTypeMapper.xml rename to inventory-dao/src/main/resources/mapper/ent/EntUserTypeMapper.xml index 170ca2b..c52cc9f 100644 --- a/inventory-dao/src/main/resources/mapper/EntUserTypeMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/EntUserTypeMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/inventory-dao/src/main/resources/mapper/ex/ExExamineItemMapper.xml b/inventory-dao/src/main/resources/mapper/ex/ExExamineItemMapper.xml new file mode 100644 index 0000000..e72e11e --- /dev/null +++ b/inventory-dao/src/main/resources/mapper/ex/ExExamineItemMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + item_id, examine_id,title, item_score, parent_id, parent_path, item_type, sort_id, + del_state, create_time, create_by, modify_time, modify_by + + + diff --git a/inventory-dao/src/main/resources/mapper/ex/ExExamineMapper.xml b/inventory-dao/src/main/resources/mapper/ex/ExExamineMapper.xml new file mode 100644 index 0000000..b081ceb --- /dev/null +++ b/inventory-dao/src/main/resources/mapper/ex/ExExamineMapper.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + examine_id, title, year_num, start_time, end_time, state, del_state, create_time, create_by, modify_time, modify_by + + + + + + + + + diff --git a/inventory-dao/src/main/resources/mapper/ex/ExStandardMapper.xml b/inventory-dao/src/main/resources/mapper/ex/ExStandardMapper.xml new file mode 100644 index 0000000..f3a8dc0 --- /dev/null +++ b/inventory-dao/src/main/resources/mapper/ex/ExStandardMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + standard_id, examine_id,title, score, item_id, item_path, perform_id, examine_state, + item_type, sort_id, del_state, create_time, create_by, modify_time, modify_by + + + diff --git a/inventory-dao/src/main/resources/mapper/SysCodeMapper.xml b/inventory-dao/src/main/resources/mapper/sys/SysCodeMapper.xml similarity index 94% rename from inventory-dao/src/main/resources/mapper/SysCodeMapper.xml rename to inventory-dao/src/main/resources/mapper/sys/SysCodeMapper.xml index 0157140..856cd09 100644 --- a/inventory-dao/src/main/resources/mapper/SysCodeMapper.xml +++ b/inventory-dao/src/main/resources/mapper/sys/SysCodeMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -13,7 +13,7 @@ - + @@ -81,7 +81,7 @@ Comments - select distinct @@ -97,7 +97,7 @@ order by ${orderByClause} - select distinct @@ -131,13 +131,13 @@ delete from SysCode where SysCodeId = #{syscodeid,jdbcType=CHAR} - + delete from SysCode - + insert into SysCode (SysCodeId, EnglishName, ChinaName, SortId, CodeValue, CodeText, CreatedBy, CreatedOn, ModifiedBy, @@ -147,7 +147,7 @@ #{createdby,jdbcType=VARCHAR}, #{createdon,jdbcType=TIMESTAMP}, #{modifiedby,jdbcType=VARCHAR}, #{modifiedon,jdbcType=TIMESTAMP}, #{comments,jdbcType=LONGVARCHAR}) - + insert into SysCode @@ -220,7 +220,7 @@ - select count(*) from SysCode @@ -300,7 +300,7 @@ - + update SysCode @@ -336,7 +336,7 @@ where SysCodeId = #{syscodeid,jdbcType=CHAR} - + update SysCode set EnglishName = #{englishname,jdbcType=VARCHAR}, ChinaName = #{chinaname,jdbcType=VARCHAR}, @@ -350,7 +350,7 @@ Comments = #{comments,jdbcType=LONGVARCHAR} where SysCodeId = #{syscodeid,jdbcType=CHAR} - + update SysCode set EnglishName = #{englishname,jdbcType=VARCHAR}, ChinaName = #{chinaname,jdbcType=VARCHAR}, diff --git a/inventory-dao/src/main/resources/mapper/SysDocumenttempMapper.xml b/inventory-dao/src/main/resources/mapper/sys/SysDocumenttempMapper.xml similarity index 88% rename from inventory-dao/src/main/resources/mapper/SysDocumenttempMapper.xml rename to inventory-dao/src/main/resources/mapper/sys/SysDocumenttempMapper.xml index bdb76cc..403b6dc 100644 --- a/inventory-dao/src/main/resources/mapper/SysDocumenttempMapper.xml +++ b/inventory-dao/src/main/resources/mapper/sys/SysDocumenttempMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/inventory-dao/src/main/resources/mapper/SysLogAuthMapper.xml b/inventory-dao/src/main/resources/mapper/sys/SysLogAuthMapper.xml similarity index 95% rename from inventory-dao/src/main/resources/mapper/SysLogAuthMapper.xml rename to inventory-dao/src/main/resources/mapper/sys/SysLogAuthMapper.xml index 4f5cdf2..84cb98b 100644 --- a/inventory-dao/src/main/resources/mapper/SysLogAuthMapper.xml +++ b/inventory-dao/src/main/resources/mapper/sys/SysLogAuthMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -77,7 +77,7 @@ SysLogAuthId, AuthUserId, AuthUserName, AuthOptType, AuthOptTime, AuthOptIP, AuthOptStatus, CreatedBy, CreatedOn, ModifiedBy, ModifiedOn, SysEnterpriseId - select distinct @@ -109,13 +109,13 @@ delete from SysLogAuth where SysLogAuthId = #{syslogauthid,jdbcType=VARCHAR} - + delete from SysLogAuth - + insert into SysLogAuth (SysLogAuthId, AuthUserId, AuthUserName, AuthOptType, AuthOptTime, AuthOptIP, AuthOptStatus, CreatedBy, CreatedOn, @@ -127,7 +127,7 @@ #{modifiedby,jdbcType=VARCHAR}, #{modifiedon,jdbcType=TIMESTAMP}, #{sysenterpriseid,jdbcType=VARCHAR} ) - + insert into SysLogAuth @@ -206,7 +206,7 @@ - select count(*) from SysLogAuth @@ -274,7 +274,7 @@ - + update SysLogAuth @@ -313,7 +313,7 @@ where SysLogAuthId = #{syslogauthid,jdbcType=VARCHAR} - + update SysLogAuth set AuthUserId = #{authuserid,jdbcType=VARCHAR}, AuthUserName = #{authusername,jdbcType=VARCHAR}, diff --git a/inventory-dao/src/main/resources/mapper/SysLogOptMapper.xml b/inventory-dao/src/main/resources/mapper/sys/SysLogOptMapper.xml similarity index 95% rename from inventory-dao/src/main/resources/mapper/SysLogOptMapper.xml rename to inventory-dao/src/main/resources/mapper/sys/SysLogOptMapper.xml index 0bea6c9..c10cf1a 100644 --- a/inventory-dao/src/main/resources/mapper/SysLogOptMapper.xml +++ b/inventory-dao/src/main/resources/mapper/sys/SysLogOptMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -18,7 +18,7 @@ - + @@ -87,7 +87,7 @@ ObjCnt1, ObjCnt2 - select distinct @@ -103,7 +103,7 @@ order by ${orderByClause} - select distinct @@ -137,13 +137,13 @@ delete from SysLogOpt where SysLogOptId = #{syslogoptid,jdbcType=VARCHAR} - + delete from SysLogOpt - + insert into SysLogOpt (SysLogOptId, ObjName, ObjChinaName, ObjectId, ObjectText, OptId, OptUserName, OptChinaName, OptType, @@ -157,7 +157,7 @@ #{modifiedby,jdbcType=VARCHAR}, #{modifiedon,jdbcType=TIMESTAMP}, #{sysenterpriseid,jdbcType=VARCHAR}, #{objcnt1,jdbcType=LONGVARCHAR}, #{objcnt2,jdbcType=LONGVARCHAR}) - + insert into SysLogOpt @@ -266,7 +266,7 @@ - select count(*) from SysLogOpt @@ -375,7 +375,7 @@ - + update SysLogOpt @@ -429,7 +429,7 @@ where SysLogOptId = #{syslogoptid,jdbcType=VARCHAR} - + update SysLogOpt set ObjName = #{objname,jdbcType=VARCHAR}, ObjChinaName = #{objchinaname,jdbcType=VARCHAR}, @@ -449,7 +449,7 @@ ObjCnt2 = #{objcnt2,jdbcType=LONGVARCHAR} where SysLogOptId = #{syslogoptid,jdbcType=VARCHAR} - + update SysLogOpt set ObjName = #{objname,jdbcType=VARCHAR}, ObjChinaName = #{objchinaname,jdbcType=VARCHAR}, diff --git a/inventory-dao/src/main/resources/mapper/SysLogsMapper.xml b/inventory-dao/src/main/resources/mapper/sys/SysLogsMapper.xml similarity index 100% rename from inventory-dao/src/main/resources/mapper/SysLogsMapper.xml rename to inventory-dao/src/main/resources/mapper/sys/SysLogsMapper.xml diff --git a/inventory-dao/src/main/resources/mapper/SysOrgMapper.xml b/inventory-dao/src/main/resources/mapper/sys/SysOrgMapper.xml similarity index 97% rename from inventory-dao/src/main/resources/mapper/SysOrgMapper.xml rename to inventory-dao/src/main/resources/mapper/sys/SysOrgMapper.xml index 2e2f3b0..8c572ee 100644 --- a/inventory-dao/src/main/resources/mapper/SysOrgMapper.xml +++ b/inventory-dao/src/main/resources/mapper/sys/SysOrgMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -75,7 +75,7 @@ OrgCode, OrgName, OrgLevel, SuperiorOrgCode,charger, CreatedBy, CreatedOn, ModifiedBy, ModifiedOn - select distinct @@ -107,13 +107,13 @@ delete from SysOrg where OrgCode = #{orgcode,jdbcType=VARCHAR} - + delete from SysOrg - + insert into SysOrg @@ -174,7 +174,7 @@ - select count(*) from SysOrg @@ -230,7 +230,7 @@ - + update SysOrg @@ -260,7 +260,7 @@ where OrgCode = #{orgcode,jdbcType=VARCHAR} - + update SysOrg set OrgName = #{orgname,jdbcType=VARCHAR}, OrgLevel = #{orglevel,jdbcType=INTEGER}, @@ -312,7 +312,7 @@ - + diff --git a/inventory-dao/src/main/resources/mapper/SysResourceMapper.xml b/inventory-dao/src/main/resources/mapper/sys/SysResourceMapper.xml similarity index 100% rename from inventory-dao/src/main/resources/mapper/SysResourceMapper.xml rename to inventory-dao/src/main/resources/mapper/sys/SysResourceMapper.xml diff --git a/inventory-dao/src/main/resources/mapper/SysRoleMapper.xml b/inventory-dao/src/main/resources/mapper/sys/SysRoleMapper.xml similarity index 94% rename from inventory-dao/src/main/resources/mapper/SysRoleMapper.xml rename to inventory-dao/src/main/resources/mapper/sys/SysRoleMapper.xml index 37cc7d9..7814ae3 100644 --- a/inventory-dao/src/main/resources/mapper/SysRoleMapper.xml +++ b/inventory-dao/src/main/resources/mapper/sys/SysRoleMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -72,7 +72,7 @@ SysRoleId, RoleCode, RoleName, SpecialRole, ModifiedBy, ModifiedOn, CreatedBy, CreatedOn - select distinct @@ -104,13 +104,13 @@ delete from SysRole where SysRoleId = #{sysroleid,jdbcType=CHAR} - + delete from SysRole - + insert into SysRole (SysRoleId, RoleCode, RoleName, SpecialRole, ModifiedBy, ModifiedOn, CreatedBy, CreatedOn) @@ -118,7 +118,7 @@ #{specialrole,jdbcType=VARCHAR}, #{modifiedby,jdbcType=VARCHAR}, #{modifiedon,jdbcType=TIMESTAMP}, #{createdby,jdbcType=VARCHAR}, #{createdon,jdbcType=TIMESTAMP}) - + insert into SysRole @@ -173,7 +173,7 @@ - select count(*) from SysRole @@ -225,7 +225,7 @@ - + update SysRole @@ -252,7 +252,7 @@ where SysRoleId = #{sysroleid,jdbcType=CHAR} - + update SysRole set RoleCode = #{rolecode,jdbcType=VARCHAR}, RoleName = #{rolename,jdbcType=VARCHAR}, diff --git a/inventory-dao/src/main/resources/mapper/SysRoleResourceMapper.xml b/inventory-dao/src/main/resources/mapper/sys/SysRoleResourceMapper.xml similarity index 92% rename from inventory-dao/src/main/resources/mapper/SysRoleResourceMapper.xml rename to inventory-dao/src/main/resources/mapper/sys/SysRoleResourceMapper.xml index d3ab5d1..40dca70 100644 --- a/inventory-dao/src/main/resources/mapper/SysRoleResourceMapper.xml +++ b/inventory-dao/src/main/resources/mapper/sys/SysRoleResourceMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -71,7 +71,7 @@ role_resource_id, role_id, resource_id, modified, created, modify_time, create_time - select distinct @@ -93,13 +93,13 @@ - + delete from sys_role_resource - + insert into sys_role_resource (role_resource_id, role_id, resource_id, modified, created, modify_time, create_time) @@ -107,7 +107,7 @@ #{modified,jdbcType=VARCHAR}, #{created,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}) - + insert into sys_role_resource @@ -156,7 +156,7 @@ - select count(*) from sys_role_resource diff --git a/inventory-dao/src/main/resources/mapper/SysStatuteDescMapper.xml b/inventory-dao/src/main/resources/mapper/sys/SysStatuteDescMapper.xml similarity index 92% rename from inventory-dao/src/main/resources/mapper/SysStatuteDescMapper.xml rename to inventory-dao/src/main/resources/mapper/sys/SysStatuteDescMapper.xml index 6e02932..c6446a4 100644 --- a/inventory-dao/src/main/resources/mapper/SysStatuteDescMapper.xml +++ b/inventory-dao/src/main/resources/mapper/sys/SysStatuteDescMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -9,7 +9,7 @@ - + @@ -76,7 +76,7 @@ content - select distinct @@ -92,7 +92,7 @@ order by ${orderByClause} - select distinct @@ -114,13 +114,13 @@ - + delete from sys_statute_desc - + insert into sys_statute_desc (desc_id, statute_id, modified, created, modify_time, create_time, content) @@ -128,7 +128,7 @@ #{created,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, #{content,jdbcType=LONGVARCHAR}) - + insert into sys_statute_desc @@ -177,7 +177,7 @@ - select count(*) from sys_statute_desc diff --git a/inventory-dao/src/main/resources/mapper/SysStatuteMapper.xml b/inventory-dao/src/main/resources/mapper/sys/SysStatuteMapper.xml similarity index 93% rename from inventory-dao/src/main/resources/mapper/SysStatuteMapper.xml rename to inventory-dao/src/main/resources/mapper/sys/SysStatuteMapper.xml index 35416ec..f25df6a 100644 --- a/inventory-dao/src/main/resources/mapper/SysStatuteMapper.xml +++ b/inventory-dao/src/main/resources/mapper/sys/SysStatuteMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -73,7 +73,7 @@ statute_id, statute_title, parent_id, statute_sort, modified, created, modify_time, create_time - select distinct @@ -95,13 +95,13 @@ - + delete from sys_statute - + insert into sys_statute (statute_id, statute_title, parent_id, statute_sort, modified, created, modify_time, create_time) @@ -109,7 +109,7 @@ #{statuteSort,jdbcType=INTEGER}, #{modified,jdbcType=VARCHAR}, #{created,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}) - + insert into sys_statute @@ -164,7 +164,7 @@ - select count(*) from sys_statute diff --git a/inventory-dao/src/main/resources/mapper/SysUnitTradeMapper.xml b/inventory-dao/src/main/resources/mapper/sys/SysUnitTradeMapper.xml similarity index 85% rename from inventory-dao/src/main/resources/mapper/SysUnitTradeMapper.xml rename to inventory-dao/src/main/resources/mapper/sys/SysUnitTradeMapper.xml index acd0258..0e6315d 100644 --- a/inventory-dao/src/main/resources/mapper/SysUnitTradeMapper.xml +++ b/inventory-dao/src/main/resources/mapper/sys/SysUnitTradeMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/inventory-dao/src/main/resources/mapper/SysWarningMapper.xml b/inventory-dao/src/main/resources/mapper/sys/SysWarningMapper.xml similarity index 91% rename from inventory-dao/src/main/resources/mapper/SysWarningMapper.xml rename to inventory-dao/src/main/resources/mapper/sys/SysWarningMapper.xml index 780d006..acd9373 100644 --- a/inventory-dao/src/main/resources/mapper/SysWarningMapper.xml +++ b/inventory-dao/src/main/resources/mapper/sys/SysWarningMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/inventory-dao/src/main/resources/mapper/SysWarningTypeMapper.xml b/inventory-dao/src/main/resources/mapper/sys/SysWarningTypeMapper.xml similarity index 90% rename from inventory-dao/src/main/resources/mapper/SysWarningTypeMapper.xml rename to inventory-dao/src/main/resources/mapper/sys/SysWarningTypeMapper.xml index c866d95..1489b40 100644 --- a/inventory-dao/src/main/resources/mapper/SysWarningTypeMapper.xml +++ b/inventory-dao/src/main/resources/mapper/sys/SysWarningTypeMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -27,7 +27,7 @@ - + diff --git a/inventory-dao/src/main/resources/mapper/SysWarningUserMapper.xml b/inventory-dao/src/main/resources/mapper/sys/SysWarningUserMapper.xml similarity index 92% rename from inventory-dao/src/main/resources/mapper/SysWarningUserMapper.xml rename to inventory-dao/src/main/resources/mapper/sys/SysWarningUserMapper.xml index 3d895da..f64a3d1 100644 --- a/inventory-dao/src/main/resources/mapper/SysWarningUserMapper.xml +++ b/inventory-dao/src/main/resources/mapper/sys/SysWarningUserMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -24,7 +24,7 @@ - + diff --git a/inventory-dao/src/main/resources/mapper/SysdocumentMapper.xml b/inventory-dao/src/main/resources/mapper/sys/SysdocumentMapper.xml similarity index 94% rename from inventory-dao/src/main/resources/mapper/SysdocumentMapper.xml rename to inventory-dao/src/main/resources/mapper/sys/SysdocumentMapper.xml index 94b0dab..a50d1ac 100644 --- a/inventory-dao/src/main/resources/mapper/SysdocumentMapper.xml +++ b/inventory-dao/src/main/resources/mapper/sys/SysdocumentMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -78,7 +78,7 @@ SysDocumentId, BizFileName, SortId, RealFileName, FilePath, FileType, FileSize, OTCId, OTCType, CreatedOn, CreatedBy, ModifiedOn, ModifiedBy - select distinct @@ -100,13 +100,13 @@ - + delete from sysdocument - + insert into sysdocument (SysDocumentId, BizFileName, SortId, RealFileName, FilePath, FileType, FileSize, OTCId, OTCType, @@ -118,7 +118,7 @@ #{createdOn,jdbcType=TIMESTAMP}, #{createdBy,jdbcType=VARCHAR}, #{modifiedOn,jdbcType=TIMESTAMP}, #{modifiedBy,jdbcType=VARCHAR}) - + insert into sysdocument @@ -203,7 +203,7 @@ - select count(*) from sysdocument diff --git a/inventory-dao/src/main/resources/mapper/user/ListPerformMapper.xml b/inventory-dao/src/main/resources/mapper/user/ListPerformMapper.xml index fb7dce3..5670b10 100644 --- a/inventory-dao/src/main/resources/mapper/user/ListPerformMapper.xml +++ b/inventory-dao/src/main/resources/mapper/user/ListPerformMapper.xml @@ -17,6 +17,7 @@ + @@ -88,7 +89,7 @@ ListPerformId, PerformClassCode, PerformClassName, SortId, SysLevel, SupClassId, completion,parent_path,parent_name, - performName,area_code,area_path,area_path_name,position_type, + performName,area_code,area_path,area_path_name,position_type,examine_state, SupClassCode, viewJurisdiction,SupClassName, CreatedOn, CreatedBy, ModifiedOn, ModifiedBy @@ -934,4 +935,11 @@ ORDER BY lf.`SysLevel` ASC,sp.`SortId` ASC,lf.`SortId` ASC + + + diff --git a/inventory-ent/src/main/java/com/rzyc/controller/BaseController.java b/inventory-ent/src/main/java/com/rzyc/controller/BaseController.java index b25cff8..add6cb5 100644 --- a/inventory-ent/src/main/java/com/rzyc/controller/BaseController.java +++ b/inventory-ent/src/main/java/com/rzyc/controller/BaseController.java @@ -26,12 +26,15 @@ import com.rzyc.mapper.log.*; import com.rzyc.mapper.organization.*; import com.rzyc.mapper.oth.*; import com.rzyc.mapper.personal.*; +import com.rzyc.mapper.sys.*; import com.rzyc.mapper.user.*; import com.rzyc.model.*; import com.rzyc.model.check.BookEntCheck; import com.rzyc.model.check.BookEntHT; import com.rzyc.model.check.ChkPerson; import com.rzyc.model.ent.*; +import com.rzyc.model.sys.SysLogAuth; +import com.rzyc.model.sys.SysRole; import com.rzyc.model.user.*; import org.springframework.beans.factory.annotation.Autowired; diff --git a/inventory-ent/src/main/java/com/rzyc/controller/CommonController.java b/inventory-ent/src/main/java/com/rzyc/controller/CommonController.java index ae2dd65..00ac589 100644 --- a/inventory-ent/src/main/java/com/rzyc/controller/CommonController.java +++ b/inventory-ent/src/main/java/com/rzyc/controller/CommonController.java @@ -9,7 +9,7 @@ import com.common.utils.model.Message; import com.common.utils.model.MultiResult; import com.common.utils.model.SingleResult; import com.common.utils.verification.Verification; -import com.rzyc.model.SysOrg; +import com.rzyc.model.sys.SysOrg; import com.rzyc.service.PcBusinessService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/inventory-ent/src/main/java/com/rzyc/controller/EmergencyEquipmentController.java b/inventory-ent/src/main/java/com/rzyc/controller/EmergencyEquipmentController.java index 690243f..ee7836b 100644 --- a/inventory-ent/src/main/java/com/rzyc/controller/EmergencyEquipmentController.java +++ b/inventory-ent/src/main/java/com/rzyc/controller/EmergencyEquipmentController.java @@ -4,10 +4,10 @@ package com.rzyc.controller; import com.common.utils.model.SingleResult; import com.rzyc.config.MethodAnnotation; import com.rzyc.config.RedisUtil; -import com.rzyc.model.EntEmEquipment; -import com.rzyc.model.EntEmExpert; -import com.rzyc.model.EntEmRehearsal; -import com.rzyc.model.EntEmReservePlan; +import com.rzyc.model.ent.EntEmEquipment; +import com.rzyc.model.ent.EntEmExpert; +import com.rzyc.model.ent.EntEmRehearsal; +import com.rzyc.model.ent.EntEmReservePlan; import com.rzyc.model.dto.EntEmEquipmentDto; import com.rzyc.model.dto.EntEmExpertDto; import com.rzyc.model.dto.EntEmRehearsalDto; @@ -17,7 +17,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.ibatis.annotations.Param; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Controller; import org.springframework.validation.annotation.Validated; diff --git a/inventory-ent/src/main/java/com/rzyc/controller/EnterpriseEquipmentController.java b/inventory-ent/src/main/java/com/rzyc/controller/EnterpriseEquipmentController.java index 6650802..5e6ee4c 100644 --- a/inventory-ent/src/main/java/com/rzyc/controller/EnterpriseEquipmentController.java +++ b/inventory-ent/src/main/java/com/rzyc/controller/EnterpriseEquipmentController.java @@ -5,13 +5,13 @@ import com.common.utils.model.SingleResult; import com.rzyc.config.MethodAnnotation; import com.rzyc.model.*; import com.rzyc.model.dto.*; +import com.rzyc.model.ent.*; import com.rzyc.service.MobileBusinessService; import com.rzyc.service.PcBusinessService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.ibatis.annotations.Param; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Controller; import org.springframework.validation.annotation.Validated; @@ -81,7 +81,7 @@ public class EnterpriseEquipmentController extends BaseController { @PreAuthorize("hasAnyAuthority('entEquipmentList','entEquipmentList:update')") @MethodAnnotation(authorizations = {"entEquipmentList","entEquipmentList:update"},name = "企业设备列表") @ResponseBody - public SingleResult> entEquipmentList(@RequestParam(required = true) String enterpriseId, String typeId,Integer page,Integer pageSize,String keyWord)throws Exception{ + public SingleResult> entEquipmentList(@RequestParam(required = true) String enterpriseId, String typeId, Integer page, Integer pageSize, String keyWord)throws Exception{ return pcBusinessService.entEquipmentList(enterpriseId,typeId,page,pageSize,keyWord); } @@ -184,7 +184,7 @@ public class EnterpriseEquipmentController extends BaseController { @ApiImplicitParam(name = "deviceId", value = "设备id", required = false, dataType = "string") }) @ResponseBody - public SingleResult> deviceInspectionCycle(String inspectionName,String deviceId,Integer page,Integer pageSize)throws Exception{ + public SingleResult> deviceInspectionCycle(String inspectionName, String deviceId, Integer page, Integer pageSize)throws Exception{ return pcBusinessService.deviceInspectionCycle(inspectionName,deviceId,page,pageSize); } @@ -288,7 +288,7 @@ public class EnterpriseEquipmentController extends BaseController { @PreAuthorize("hasAnyAuthority('entDeviceMaintenancePlan','entDeviceMaintenancePlan:update')") @MethodAnnotation(authorizations = {"entDeviceMaintenancePlan","entDeviceMaintenancePlan:update"},name = "保养计划列表") @ResponseBody - public SingleResult> entDeviceMaintenancePlan(String deviceId,Integer page, Integer pageSize)throws Exception{ + public SingleResult> entDeviceMaintenancePlan(String deviceId, Integer page, Integer pageSize)throws Exception{ return pcBusinessService.entDeviceMaintenancePlan(deviceId,page,pageSize) ; } @@ -321,7 +321,7 @@ public class EnterpriseEquipmentController extends BaseController { @PreAuthorize("hasAnyAuthority('entDeviceMaintenanceRecord','entDeviceMaintenanceRecord:update')") @MethodAnnotation(authorizations = {"entDeviceMaintenanceRecord","entDeviceMaintenanceRecord:update"},name = "保养记录") @ResponseBody - public SingleResult> entDeviceMaintenanceRecord(String deviceId,Integer page,Integer pageSize)throws Exception{ + public SingleResult> entDeviceMaintenanceRecord(String deviceId, Integer page, Integer pageSize)throws Exception{ return pcBusinessService.entDeviceMaintenanceRecord(deviceId,page,pageSize); } diff --git a/inventory-ent/src/main/java/com/rzyc/controller/MinWorkController.java b/inventory-ent/src/main/java/com/rzyc/controller/MinWorkController.java index 9294905..c6738d4 100644 --- a/inventory-ent/src/main/java/com/rzyc/controller/MinWorkController.java +++ b/inventory-ent/src/main/java/com/rzyc/controller/MinWorkController.java @@ -1,57 +1,28 @@ package com.rzyc.controller; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.common.utils.*; -import com.common.utils.SMS.SendSMS; -import com.common.utils.jwt.JwtUtil; import com.common.utils.model.*; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; -import com.rzyc.advice.LoginAuth; -import com.rzyc.bean.HiddenDanger; -import com.rzyc.bean.SysEnterpriseDo; -import com.rzyc.bean.check.*; -import com.rzyc.bean.check.dto.ListQuotaDto; -import com.rzyc.bean.check.dto.ListWorkDto; -import com.rzyc.bean.check.dto.WorkPageDto; -import com.rzyc.bean.check.vo.WorkPageVo; -import com.rzyc.bean.ent.MinCompaniesDto; import com.rzyc.config.MethodAnnotation; -import com.rzyc.enums.DelState; -import com.rzyc.enums.DocumentOtcType; -import com.rzyc.enums.FactorType; -import com.rzyc.enums.ReportSuperior; import com.rzyc.model.*; import com.rzyc.model.check.*; import com.rzyc.model.dto.AddOrUpdateInspectionRecordDto; import com.rzyc.model.dto.EntRepairRecordDto; import com.rzyc.model.ent.*; -import com.rzyc.model.user.ListFactor; -import com.rzyc.model.user.ListPerform; -import com.rzyc.model.user.SysUnit; -import com.rzyc.model.user.SysUser; import com.rzyc.service.PcBusinessService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.beanutils.ConvertUtils; -import org.apache.commons.beanutils.converters.DateConverter; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Controller; -import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.*; -import java.math.BigDecimal; import java.util.*; @Api(tags = "小程序") diff --git a/inventory-ent/src/main/java/com/rzyc/controller/OtherController.java b/inventory-ent/src/main/java/com/rzyc/controller/OtherController.java index b77b357..4296f5a 100644 --- a/inventory-ent/src/main/java/com/rzyc/controller/OtherController.java +++ b/inventory-ent/src/main/java/com/rzyc/controller/OtherController.java @@ -17,7 +17,7 @@ import com.rzyc.bean.ent.IndustryClassDto; import com.rzyc.enums.EntListType; import com.rzyc.model.AppHelp; import com.rzyc.model.Dynamic; -import com.rzyc.model.SysOrg; +import com.rzyc.model.sys.SysOrg; import com.rzyc.model.ent.*; import com.rzyc.service.TaskService; import io.swagger.annotations.Api; diff --git a/inventory-ent/src/main/java/com/rzyc/controller/PcCompanyController.java b/inventory-ent/src/main/java/com/rzyc/controller/PcCompanyController.java index 6a41be3..afd8b91 100644 --- a/inventory-ent/src/main/java/com/rzyc/controller/PcCompanyController.java +++ b/inventory-ent/src/main/java/com/rzyc/controller/PcCompanyController.java @@ -21,8 +21,8 @@ import com.rzyc.config.MethodAnnotation; import com.rzyc.enums.AuditStatusEnum; import com.rzyc.model.Accident; import com.rzyc.model.DangerStatistic; -import com.rzyc.model.EntCertificates; -import com.rzyc.model.SysOrg; +import com.rzyc.model.ent.EntCertificates; +import com.rzyc.model.sys.SysOrg; import com.rzyc.model.check.*; import com.rzyc.model.ent.EntBillCon; import com.rzyc.model.ent.InEntList; @@ -42,7 +42,6 @@ import org.apache.commons.beanutils.converters.DateConverter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/inventory-ent/src/main/java/com/rzyc/controller/PersonalController.java b/inventory-ent/src/main/java/com/rzyc/controller/PersonalController.java index bef6e63..e951dc4 100644 --- a/inventory-ent/src/main/java/com/rzyc/controller/PersonalController.java +++ b/inventory-ent/src/main/java/com/rzyc/controller/PersonalController.java @@ -13,20 +13,16 @@ import com.rzyc.config.MethodAnnotation; import com.rzyc.config.RedisUtil; import com.rzyc.model.*; import com.rzyc.model.dto.*; -import com.rzyc.model.ent.EntPost; -import com.rzyc.model.ent.EntUser; +import com.rzyc.model.ent.*; import com.rzyc.service.PcBusinessService; import com.rzyc.service.UserLoginService; import com.rzyc.bean.user.dto.WeChartLoginDto; -import com.rzyc.model.ent.SysEnterprise; import com.rzyc.model.user.SysUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; diff --git a/inventory-ent/src/main/java/com/rzyc/controller/UploadController.java b/inventory-ent/src/main/java/com/rzyc/controller/UploadController.java index ecd1a9e..8e7c370 100644 --- a/inventory-ent/src/main/java/com/rzyc/controller/UploadController.java +++ b/inventory-ent/src/main/java/com/rzyc/controller/UploadController.java @@ -1,16 +1,12 @@ package com.rzyc.controller; -import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.read.listener.PageReadListener; -import com.alibaba.fastjson.JSON; import com.common.utils.RandomNumber; import com.common.utils.StringUtils; import com.common.utils.model.*; import com.common.utils.upload.FileUpload; import com.rzyc.bean.file.FileResult; import com.rzyc.bean.file.FileResults; -import com.rzyc.model.Sysdocument; -import com.rzyc.model.ent.InList; +import com.rzyc.model.sys.Sysdocument; import com.rzyc.service.PcBusinessService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/inventory-ent/src/main/java/com/rzyc/service/AssignmentTaskThread.java b/inventory-ent/src/main/java/com/rzyc/service/AssignmentTaskThread.java index ec8da43..c91859a 100644 --- a/inventory-ent/src/main/java/com/rzyc/service/AssignmentTaskThread.java +++ b/inventory-ent/src/main/java/com/rzyc/service/AssignmentTaskThread.java @@ -9,15 +9,15 @@ import com.common.utils.model.Message; import com.common.utils.model.SingleResult; import com.rzyc.bean.OaTaskTime; import com.rzyc.enums.DelState; -import com.rzyc.mapper.EntPostListMapper; -import com.rzyc.mapper.EntPostTaskMapper; +import com.rzyc.mapper.ent.EntPostListMapper; +import com.rzyc.mapper.ent.EntPostTaskMapper; import com.rzyc.mapper.InPostItemMapper; import com.rzyc.mapper.InPostListMapper; import com.rzyc.mapper.ent.EntPostMapper; import com.rzyc.mapper.ent.EntUserMapper; import com.rzyc.mapper.ent.InEntListMapper; -import com.rzyc.model.EntPostList; -import com.rzyc.model.EntPostTask; +import com.rzyc.model.ent.EntPostList; +import com.rzyc.model.ent.EntPostTask; import com.rzyc.model.InPostItem; import com.rzyc.model.InPostList; import com.rzyc.model.dto.AddOrUpdateEntUserPostListDto; diff --git a/inventory-ent/src/main/java/com/rzyc/service/DeviceInspectionCycle.java b/inventory-ent/src/main/java/com/rzyc/service/DeviceInspectionCycle.java index 275f820..92ae89e 100644 --- a/inventory-ent/src/main/java/com/rzyc/service/DeviceInspectionCycle.java +++ b/inventory-ent/src/main/java/com/rzyc/service/DeviceInspectionCycle.java @@ -1,12 +1,10 @@ package com.rzyc.service; -import com.rzyc.mapper.EntDeviceInsCycleMapper; -import com.rzyc.mapper.EntDeviceMapper; -import com.rzyc.model.EntDeviceInsCycle; +import com.rzyc.mapper.ent.EntDeviceInsCycleMapper; +import com.rzyc.mapper.ent.EntDeviceMapper; +import com.rzyc.model.ent.EntDeviceInsCycle; -import java.text.DateFormat; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.List; /** * @author Xuwanxin diff --git a/inventory-ent/src/main/java/com/rzyc/service/EntPostDutyThread.java b/inventory-ent/src/main/java/com/rzyc/service/EntPostDutyThread.java index 9658a71..f07978b 100644 --- a/inventory-ent/src/main/java/com/rzyc/service/EntPostDutyThread.java +++ b/inventory-ent/src/main/java/com/rzyc/service/EntPostDutyThread.java @@ -2,9 +2,9 @@ package com.rzyc.service; import com.common.utils.RandomNumber; -import com.rzyc.mapper.EntPostDutyMapper; +import com.rzyc.mapper.ent.EntPostDutyMapper; import com.rzyc.mapper.ent.InEntListMapper; -import com.rzyc.model.EntPostDuty; +import com.rzyc.model.ent.EntPostDuty; import com.rzyc.model.ent.EntPost; import com.rzyc.model.ent.InEntList; diff --git a/inventory-ent/src/main/java/com/rzyc/service/MobileBusinessService.java b/inventory-ent/src/main/java/com/rzyc/service/MobileBusinessService.java index 04038bb..413e643 100644 --- a/inventory-ent/src/main/java/com/rzyc/service/MobileBusinessService.java +++ b/inventory-ent/src/main/java/com/rzyc/service/MobileBusinessService.java @@ -5,7 +5,7 @@ import com.common.utils.model.SingleResult; import com.common.utils.pager.PageOperation; import com.rzyc.controller.BaseController; import com.rzyc.model.DangerStatistic; -import com.rzyc.model.EntDevice; +import com.rzyc.model.ent.EntDevice; import org.springframework.stereotype.Service; import java.util.List; diff --git a/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java b/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java index 4e43c9b..354019f 100644 --- a/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java +++ b/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java @@ -18,15 +18,11 @@ import com.rzyc.model.*; import com.rzyc.model.EasyExcel.EasyExcelEnterprise; import com.rzyc.model.EasyExcel.EasyExcelInList; import com.rzyc.model.dto.*; -import com.rzyc.model.ent.EntPost; -import com.rzyc.model.ent.EntUser; +import com.rzyc.model.ent.*; import com.rzyc.model.dto.SparePartDto; -import com.rzyc.model.ent.InEntList; -import com.rzyc.model.ent.SysEnterprise; import com.rzyc.utils.easyexcel.EntEnterpriseListener; import com.rzyc.utils.easyexcel.InListListener; -import org.apache.commons.collections.list.SynchronizedList; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/inventory-ent/src/main/java/com/rzyc/service/SaveEntPostAndUserThread.java b/inventory-ent/src/main/java/com/rzyc/service/SaveEntPostAndUserThread.java index 522834d..a1083fe 100644 --- a/inventory-ent/src/main/java/com/rzyc/service/SaveEntPostAndUserThread.java +++ b/inventory-ent/src/main/java/com/rzyc/service/SaveEntPostAndUserThread.java @@ -5,19 +5,16 @@ import com.common.utils.RandomNumber; import com.common.utils.encryption.MD5; import com.rzyc.config.ConstantsConfigure; import com.rzyc.enums.PostListType; -import com.rzyc.mapper.EntPostDutyMapper; +import com.rzyc.mapper.ent.EntPostDutyMapper; import com.rzyc.mapper.ent.EntPostMapper; import com.rzyc.mapper.ent.EntUserMapper; import com.rzyc.mapper.ent.InListItemMapper; import com.rzyc.mapper.ent.InListMapper; -import com.rzyc.model.EntPostDuty; -import com.rzyc.model.InPost; -import com.rzyc.model.InPostItem; +import com.rzyc.model.ent.EntPostDuty; import com.rzyc.model.ent.EntPost; import com.rzyc.model.ent.EntUser; import com.rzyc.model.ent.InList; import com.rzyc.model.ent.InListItem; -import com.rzyc.utils.SpringUtil; import java.util.Date; import java.util.List; diff --git a/inventory-ent/src/main/java/com/rzyc/service/SaveIndustryPostThread.java b/inventory-ent/src/main/java/com/rzyc/service/SaveIndustryPostThread.java index 3d1aaa9..125c014 100644 --- a/inventory-ent/src/main/java/com/rzyc/service/SaveIndustryPostThread.java +++ b/inventory-ent/src/main/java/com/rzyc/service/SaveIndustryPostThread.java @@ -5,18 +5,14 @@ import com.alibaba.excel.util.ListUtils; import com.common.utils.RandomNumber; import com.rzyc.enums.PostListType; import com.rzyc.mapper.*; +import com.rzyc.mapper.ent.EntPostDutyMapper; import com.rzyc.mapper.ent.EntPostMapper; import com.rzyc.mapper.ent.InListItemMapper; import com.rzyc.mapper.ent.SysEnterpriseMapper; import com.rzyc.model.*; -import com.rzyc.model.EasyExcel.EasyExcelEnterprise; -import com.rzyc.model.ent.InEntList; -import com.rzyc.model.ent.InList; -import com.rzyc.model.ent.InListItem; -import com.rzyc.model.ent.SysEnterprise; +import com.rzyc.model.ent.*; import org.springframework.beans.factory.annotation.Autowired; -import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/inventory-ent/src/main/java/com/rzyc/utils/easyexcel/EntEnterpriseListener.java b/inventory-ent/src/main/java/com/rzyc/utils/easyexcel/EntEnterpriseListener.java index 3de2508..ff7013b 100644 --- a/inventory-ent/src/main/java/com/rzyc/utils/easyexcel/EntEnterpriseListener.java +++ b/inventory-ent/src/main/java/com/rzyc/utils/easyexcel/EntEnterpriseListener.java @@ -1,25 +1,17 @@ package com.rzyc.utils.easyexcel; import com.alibaba.excel.context.AnalysisContext; -import com.alibaba.excel.metadata.CellExtra; -import com.alibaba.excel.metadata.data.ReadCellData; import com.alibaba.excel.read.listener.ReadListener; import com.alibaba.excel.util.ListUtils; import com.alibaba.fastjson.JSON; import com.common.utils.RandomNumber; import com.common.utils.StringUtils; -import com.common.utils.copy.ObjectConversion; -import com.mysql.cj.x.protobuf.MysqlxExpr; -import com.rzyc.mapper.SysOrgMapper; +import com.rzyc.mapper.sys.SysOrgMapper; import com.rzyc.mapper.ent.BaseInClassMapper; -import com.rzyc.mapper.ent.InListItemMapper; import com.rzyc.mapper.ent.SysEnterpriseMapper; import com.rzyc.model.EasyExcel.EasyExcelEnterprise; -import com.rzyc.model.EasyExcel.EasyExcelInList; -import com.rzyc.model.SysOrg; +import com.rzyc.model.sys.SysOrg; import com.rzyc.model.ent.BaseInClass; -import com.rzyc.model.ent.InEntList; -import com.rzyc.model.ent.InListItem; import com.rzyc.model.ent.SysEnterprise; import lombok.extern.slf4j.Slf4j; diff --git a/inventory-gov/src/main/java/com/rzyc/advice/LoginAspect.java b/inventory-gov/src/main/java/com/rzyc/advice/LoginAspect.java index 206a664..6ead601 100644 --- a/inventory-gov/src/main/java/com/rzyc/advice/LoginAspect.java +++ b/inventory-gov/src/main/java/com/rzyc/advice/LoginAspect.java @@ -54,7 +54,7 @@ public class LoginAspect { //token验证 - verificationToken(userToken); +// verificationToken(userToken); return proceedingJoinPoint.proceed(); } diff --git a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java index 875e5c7..e2b2695 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java @@ -22,16 +22,24 @@ import com.rzyc.enums.*; import com.rzyc.mapper.*; import com.rzyc.mapper.check.*; import com.rzyc.mapper.ent.*; +import com.rzyc.mapper.ex.ExExamineItemMapper; +import com.rzyc.mapper.ex.ExExamineMapper; +import com.rzyc.mapper.ex.ExStandardMapper; import com.rzyc.mapper.log.*; import com.rzyc.mapper.organization.*; import com.rzyc.mapper.oth.*; import com.rzyc.mapper.personal.*; +import com.rzyc.mapper.sys.*; import com.rzyc.mapper.user.*; import com.rzyc.model.*; import com.rzyc.model.check.BookEntCheck; import com.rzyc.model.check.BookEntHT; import com.rzyc.model.check.ChkPerson; import com.rzyc.model.ent.*; +import com.rzyc.model.sys.SysLogAuth; +import com.rzyc.model.sys.SysLogOptWithBLOBs; +import com.rzyc.model.sys.SysOrg; +import com.rzyc.model.sys.SysRole; import com.rzyc.model.user.*; import com.common.utils.copy.ObjectConversion; import org.apache.poi.ss.usermodel.*; @@ -580,6 +588,18 @@ public class BaseController { @Autowired protected SysUserLoginMapper sysUserLoginMapper; + //党政同责考核 + @Autowired + protected ExExamineMapper exExamineMapper; + + //党政同责考核项 + @Autowired + protected ExExamineItemMapper exExamineItemMapper; + + //党政同责考核内容 + @Autowired + protected ExStandardMapper exStandardMapper; + diff --git a/inventory-gov/src/main/java/com/rzyc/controller/DataController.java b/inventory-gov/src/main/java/com/rzyc/controller/DataController.java index 850e130..7db6bee 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/DataController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/DataController.java @@ -9,26 +9,18 @@ import com.common.utils.encryption.PasswdFactory; import com.common.utils.model.Code; import com.common.utils.model.Message; import com.common.utils.model.SingleResult; -import com.rzyc.enums.DelState; import com.rzyc.enums.ListTargerType; import com.rzyc.enums.PositionTypeEnum; -import com.rzyc.enums.PostListType; -import com.rzyc.model.*; -import com.rzyc.model.check.ChkBillDetailWithBLOBs; import com.rzyc.model.ent.SysEnterprise; -import com.rzyc.model.organization.OrgBatch; -import com.rzyc.model.organization.OrgDanger; +import com.rzyc.model.sys.SysOrg; import com.rzyc.model.user.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.commons.beanutils.BeanUtils; import org.apache.poi.ss.usermodel.*; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import java.io.File; -import java.io.FileReader; import java.util.*; @Api(tags = "数据处理") diff --git a/inventory-gov/src/main/java/com/rzyc/controller/EnterpriseRecordController.java b/inventory-gov/src/main/java/com/rzyc/controller/EnterpriseRecordController.java index b4ed258..e001690 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/EnterpriseRecordController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/EnterpriseRecordController.java @@ -1,13 +1,10 @@ package com.rzyc.controller; import com.common.utils.model.MultiResult; -import com.common.utils.model.SingleResult; import com.rzyc.config.MethodAnnotation; -import com.rzyc.mapper.EntCertificatesMapper; -import com.rzyc.model.EntCertificates; +import com.rzyc.model.ent.EntCertificates; import com.rzyc.model.Risk.dto.RiskDto; import com.rzyc.model.Risk.vo.RiskVo; -import com.rzyc.model.RkSources; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -15,8 +12,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import javax.xml.crypto.Data; -import java.util.Date; import java.util.List; /** diff --git a/inventory-gov/src/main/java/com/rzyc/controller/ExamineController.java b/inventory-gov/src/main/java/com/rzyc/controller/ExamineController.java new file mode 100644 index 0000000..0b37cae --- /dev/null +++ b/inventory-gov/src/main/java/com/rzyc/controller/ExamineController.java @@ -0,0 +1,282 @@ +package com.rzyc.controller; + +import com.common.utils.DateUtils; +import com.common.utils.RandomNumber; +import com.common.utils.StringUtils; +import com.common.utils.model.MultiResult; +import com.common.utils.model.Pager; +import com.common.utils.model.SingleResult; +import com.rzyc.advice.LoginAuth; +import com.rzyc.bean.ex.*; +import com.rzyc.enums.DelState; +import com.rzyc.enums.ExItemType; +import com.rzyc.enums.ExamineState; +import com.rzyc.model.ex.ExExamine; +import com.rzyc.model.ex.ExExamineItem; +import com.rzyc.model.ex.ExStandard; +import com.rzyc.model.user.ListPerform; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import org.apache.poi.ss.usermodel.DateUtil; +import org.springframework.beans.BeanUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.Date; +import java.util.List; + +/** + * 党政同责考核模块 + * @author dong + * @date 2024-04-01 9:51 + * @Version V1.0 + */ +@Api(tags = "党政同责考核") +@CrossOrigin("*") +@RequestMapping("examine") +@RestController +@Validated +public class ExamineController extends BaseController{ + + + //党政同责考核默认标题 + private final static String EXAMINE_TITLE = "党政同责考核"; + + + /** + * 年度党政同责考核记录 + * @version v1.0 + * @author dong + * @date 2024/4/1 10:08 + */ + @LoginAuth + @ApiOperation(value = "年度党政同责考核记录", notes = "年度党政同责考核记录") + @GetMapping(value = "yearExamine/{yearNum}") + @ApiImplicitParam(name = "yearNum",value = "年份",required = true) + public SingleResult yearExamine(@PathVariable String yearNum)throws Exception{ + SingleResult result = new SingleResult<>(); + ExExamine exExamine = exExamineMapper.findByYear(yearNum); + if(null == exExamine){ + String userId = getUserId(); + exExamine = new ExExamine(); + exExamine.setExamineId(RandomNumber.getUUid()); + exExamine.setYearNum(yearNum); + exExamine.setTitle(yearNum+EXAMINE_TITLE); + exExamine.setState(ExamineState.AUDITING.getState()); + exExamine.setDelState(DelState.NOT_DEL.getState()); + exExamine.setCreateTime(new Date()); + exExamine.setModifyTime(new Date()); + exExamine.setCreateBy(userId); + exExamine.setModifyBy(userId); + exExamineMapper.insert(exExamine); + } + result.setData(exExamine); + return result; + } + + /** + * 党政同责信息修改 + * @version v1.0 + * @author dong + * @date 2024/4/1 14:04 + */ + @LoginAuth + @ApiOperation(value = "党政同责信息修改", notes = "党政同责信息修改") + @PostMapping(value = "yearExamineChange") + public SingleResult yearExamineChange(@RequestBody @Valid ExamineChangeDto examineChangeDto)throws Exception{ + SingleResult result = new SingleResult<>(); + ExExamine exExamine = new ExExamine(); + BeanUtils.copyProperties(examineChangeDto,exExamine); + exExamine.setStartTime(DateUtils.parseString2Date(examineChangeDto.getStartTime(),"yyyy-MM-dd")); + exExamine.setEndTime(DateUtils.parseString2Date(examineChangeDto.getEndTime(),"yyyy-MM-dd")); + String userId = getUserId(); + exExamine.setModifyBy(userId); + exExamine.setModifyTime(new Date()); + exExamineMapper.updateById(exExamine); + return result; + } + + /** + * 普通考核项新增 + * @version v1.0 + * @author dong + * @date 2024/4/1 13:43 + */ + @LoginAuth + @ApiOperation(value = "普通考核项新增", notes = "普通考核项新增") + @PostMapping(value = "itemAdd") + public SingleResult itemAdd(@Valid @RequestBody ItemAddDto itemAddDto)throws Exception{ + SingleResult result = new SingleResult<>(); + + String indexId = ""; + String pointId = ""; + String contentId = ""; + + //考核指标 + if(StringUtils.isBlank(indexId)){ + indexId = examineItemAdd(itemAddDto.getIndexName(),null, ExItemType.ORDINARY.getType(),itemAddDto.getExamineId()); + } + + //考核要点 + if(StringUtils.isBlank(pointId)){ + pointId = examineItemAdd(itemAddDto.getPointName(),indexId, ExItemType.ORDINARY.getType(),itemAddDto.getExamineId()); + } + + //考核内容 + if(StringUtils.isBlank(contentId)){ + contentId = examineItemAdd(itemAddDto.getContent(),pointId, ExItemType.ORDINARY.getType(),itemAddDto.getExamineId()); + } + + //考核内容信息 + ExExamineItem examineItem = exExamineItemMapper.selectById(contentId); + + String userId = getUserId(); + ExStandard exStandard = new ExStandard(); + exStandard.setStandardId(RandomNumber.getUUid()); + exStandard.setExamineId(itemAddDto.getExamineId()); + exStandard.setTitle(itemAddDto.getTitle()); + exStandard.setScore(itemAddDto.getScore()); + exStandard.setSortId(itemAddDto.getSortId()); + exStandard.setExamineState(itemAddDto.getExamineState()); + exStandard.setItemType(ExItemType.ORDINARY.getType()); + exStandard.setItemId(examineItem.getItemId()); + exStandard.setItemPath(examineItem.getParentPath()); + exStandard.setDelState(DelState.NOT_DEL.getState()); + exStandard.setCreateTime(new Date()); + exStandard.setModifyTime(new Date()); + exStandard.setCreateBy(userId); + exStandard.setModifyBy(userId); + exStandardMapper.insert(exStandard); + + return result; + } + + /** + * + * @version v1.0 + * @param title 考核项 + * @param parentId 考核项父级 + * @param itemType 考核项类型 1、普通 2、个性 3、加分项 + * @param examineId 考核id + * @author dong + * @date 2024/4/1 14:45 + */ + private String examineItemAdd(String title,String parentId,Integer itemType,String examineId)throws Exception{ + String userId = getUserId(); + ExExamineItem examineItem = new ExExamineItem(); + examineItem.setItemId(RandomNumber.getUUid()); + examineItem.setExamineId(examineId); + examineItem.setTitle(title); + examineItem.setItemType(itemType); + examineItem.setSortId(1); + examineItem.setDelState(DelState.NOT_DEL.getState()); + examineItem.setCreateBy(userId); + examineItem.setModifyBy(userId); + examineItem.setCreateTime(new Date()); + examineItem.setModifyTime(new Date()); + if(StringUtils.isNotBlank(parentId)){ + examineItem.setParentId(parentId); + ExExamineItem examineItemTop = exExamineItemMapper.selectById(parentId); + if(null != examineItemTop){ + examineItem.setParentPath(examineItemTop.getParentPath()+","+examineItem.getItemId()); + } + }else{ + examineItem.setParentPath(examineItem.getItemId()); + } + exExamineItemMapper.insert(examineItem); + return examineItem.getItemId(); + } + + /** + * 加分考核项新增 + * @version v1.0 + * @author dong + * @date 2024/4/1 13:43 + */ + @LoginAuth + @ApiOperation(value = "加分考核项新增", notes = "加分考核项新增") + @PostMapping(value = "itemAddBonus") + public SingleResult itemAddBonus(@Valid @RequestBody ItemAddBonusDto itemAddBonusDto)throws Exception{ + SingleResult result = new SingleResult<>(); + + String userId = getUserId(); + ExStandard exStandard = new ExStandard(); + exStandard.setStandardId(RandomNumber.getUUid()); + exStandard.setExamineId(itemAddBonusDto.getExamineId()); + exStandard.setTitle(itemAddBonusDto.getTitle()); + exStandard.setSortId(itemAddBonusDto.getSortId()); + exStandard.setExamineState(itemAddBonusDto.getExamineState()); + exStandard.setItemType(ExItemType.BONUS_POINT.getType()); + exStandard.setDelState(DelState.NOT_DEL.getState()); + exStandard.setCreateTime(new Date()); + exStandard.setModifyTime(new Date()); + exStandard.setCreateBy(userId); + exStandard.setModifyBy(userId); + exStandardMapper.insert(exStandard); + return result; + } + + /** + * 个性考核项新增 + * @version v1.0 + * @author dong + * @date 2024/4/1 13:43 + */ + @LoginAuth + @ApiOperation(value = "个性考核项新增", notes = "个性考核项新增") + @PostMapping(value = "itemAddSpecific") + public SingleResult itemAddSpecific(@Valid @RequestBody ItemAddSpecificDto itemAddSpecificDto)throws Exception{ + SingleResult result = new SingleResult<>(); + + String userId = getUserId(); + ExStandard exStandard = new ExStandard(); + exStandard.setStandardId(RandomNumber.getUUid()); + exStandard.setExamineId(itemAddSpecificDto.getExamineId()); + exStandard.setTitle(itemAddSpecificDto.getTitle()); + exStandard.setSortId(itemAddSpecificDto.getSortId()); + exStandard.setExamineState(itemAddSpecificDto.getExamineState()); + exStandard.setScore(itemAddSpecificDto.getScore()); + exStandard.setPerformId(itemAddSpecificDto.getListperformid()); + exStandard.setItemType(ExItemType.PERSONALITY.getType()); + exStandard.setDelState(DelState.NOT_DEL.getState()); + exStandard.setCreateTime(new Date()); + exStandard.setModifyTime(new Date()); + exStandard.setCreateBy(userId); + exStandard.setModifyBy(userId); + exStandardMapper.insert(exStandard); + return result; + } + + /** + * 考核部门列表 + * @version v1.0 + * @author dong + * @date 2024/4/1 15:34 + */ + @LoginAuth + @ApiOperation(value = "考核部门列表", notes = "考核部门列表") + @GetMapping(value = "unitList") + public MultiResult unitList(@Valid UnitListDto unitListDto)throws Exception{ + MultiResult result = new MultiResult<>(); + List performs = listPerformMapper.findByExamineState(unitListDto.getExamineState()); + result.setData(performs); + return result; + } + + /** + * 普通考核项列表 + * @version v1.0 + * @author dong + * @date 2024/4/1 15:57 + */ + @LoginAuth + @ApiOperation(value = "普通考核项列表", notes = "普通考核项列表") + @GetMapping(value = "standardList") + public MultiResult standardList()throws Exception{ + MultiResult result = new MultiResult<>(); + return result; + } + +} diff --git a/inventory-gov/src/main/java/com/rzyc/controller/ImportController.java b/inventory-gov/src/main/java/com/rzyc/controller/ImportController.java index 75c4775..aec5c74 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/ImportController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/ImportController.java @@ -4,22 +4,16 @@ import com.alibaba.fastjson.JSONArray; import com.common.utils.RandomNumber; import com.common.utils.StringUtils; import com.common.utils.TypeConversion; -import com.common.utils.encryption.PasswdFactory; import com.common.utils.model.Code; import com.common.utils.model.MultiResult; import com.common.utils.model.SingleResult; -import com.rzyc.enums.UnitType; import com.rzyc.model.*; -import com.rzyc.model.check.ChkBillDetail; import com.rzyc.model.check.ChkBillDetailWithBLOBs; -import com.rzyc.model.check.ChkGovBillDetail; import com.rzyc.model.ent.*; -import com.rzyc.model.oth.OthRefuge; +import com.rzyc.model.sys.SysOrg; import com.rzyc.model.user.*; import com.rzyc.service.PcBusinessService; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.poi.ss.usermodel.*; import org.springframework.beans.factory.annotation.Autowired; @@ -28,8 +22,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import java.io.*; -import java.text.SimpleDateFormat; import java.util.*; @Api(tags = "导入模块") diff --git a/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java b/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java index 8ede9c7..3fb2004 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java @@ -1,6 +1,5 @@ package com.rzyc.controller; -import cn.jpush.api.push.model.SMS; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.common.utils.*; @@ -23,6 +22,7 @@ import com.rzyc.enums.*; import com.rzyc.model.*; import com.rzyc.model.check.*; import com.rzyc.model.ent.*; +import com.rzyc.model.sys.SysOrg; import com.rzyc.model.user.*; import com.rzyc.service.AssignmentTaskThread; import com.rzyc.service.SaveEntListThread; diff --git a/inventory-gov/src/main/java/com/rzyc/controller/OtherController.java b/inventory-gov/src/main/java/com/rzyc/controller/OtherController.java index 6f6ddf1..36f4118 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/OtherController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/OtherController.java @@ -13,9 +13,8 @@ import com.rzyc.bean.ImportListDetail; import com.rzyc.bean.TreeModel; import com.rzyc.bean.ent.IndustryClassDto; import com.rzyc.enums.EntListType; -import com.rzyc.model.*; import com.rzyc.model.ent.*; -import com.rzyc.model.user.SysUser; +import com.rzyc.model.sys.SysOrg; import com.rzyc.service.TaskService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -24,7 +23,6 @@ import io.swagger.annotations.ApiOperation; import org.apache.poi.ss.usermodel.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java index 8a690b0..5b5f3f4 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java @@ -10,12 +10,10 @@ import com.common.utils.model.*; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.rzyc.advice.LoginAuth; -import com.rzyc.advice.exception.AccessException; import com.rzyc.bean.PageDto; import com.rzyc.bean.UserDepart; import com.rzyc.bean.check.CheckList; import com.rzyc.bean.check.CheckPerform; -import com.rzyc.bean.ent.CompaniesDto; import com.rzyc.bean.index.AreaDangerNum; import com.rzyc.bean.index.IndexDangerNum; import com.rzyc.bean.index.IndexOrgInfo; @@ -30,6 +28,10 @@ import com.rzyc.model.*; import com.rzyc.model.ent.SysEnterprise; import com.rzyc.model.log.SysLogs; import com.rzyc.model.personal.SysResource; +import com.rzyc.model.sys.SysLogAuth; +import com.rzyc.model.sys.SysOrg; +import com.rzyc.model.sys.SysRole; +import com.rzyc.model.sys.SysRoleResource; import com.rzyc.model.user.*; import com.rzyc.utils.IpUtil; import io.swagger.annotations.*; diff --git a/inventory-gov/src/main/java/com/rzyc/controller/SettingController.java b/inventory-gov/src/main/java/com/rzyc/controller/SettingController.java index 1c355f6..d345884 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/SettingController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/SettingController.java @@ -16,11 +16,9 @@ import com.rzyc.bean.setting.UnitInClassChangeDto; import com.rzyc.bean.user.*; import com.rzyc.bean.user.dto.UnitAuthChangeDto; import com.rzyc.enums.AreaLevel; -import com.rzyc.mapper.SysUnitTradeMapper; -import com.rzyc.model.SysDocumenttemp; -import com.rzyc.model.SysOrg; -import com.rzyc.model.SysUnitTrade; -import com.rzyc.model.ent.BaseInClass; +import com.rzyc.model.sys.SysDocumenttemp; +import com.rzyc.model.sys.SysOrg; +import com.rzyc.model.sys.SysUnitTrade; import com.rzyc.model.user.SysAuth; import com.rzyc.model.user.SysUnitRole; import com.rzyc.model.user.SysUser; diff --git a/inventory-gov/src/main/java/com/rzyc/controller/TaskController.java b/inventory-gov/src/main/java/com/rzyc/controller/TaskController.java index cd5af48..d93e3c0 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/TaskController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/TaskController.java @@ -7,17 +7,15 @@ import com.common.utils.model.Pager; import com.common.utils.model.SingleResult; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; -import com.rzyc.bean.UserDepart; -import com.rzyc.bean.task.dto.AddTaskDto; import com.rzyc.bean.task.dto.IdDto; import com.rzyc.bean.task.dto.UserWarningDto; import com.rzyc.bean.task.vo.TaskDetailVo; -import com.rzyc.bean.task.vo.TaskNameVo; import com.rzyc.bean.task.vo.TaskVo; -import com.rzyc.bean.task.vo.ThingVo; import com.rzyc.enums.DelState; -import com.rzyc.mapper.SysWarningTypeMapper; import com.rzyc.model.*; +import com.rzyc.model.sys.SysWarning; +import com.rzyc.model.sys.SysWarningType; +import com.rzyc.model.sys.SysWarningUser; import com.rzyc.model.task.dto.TaskAddOrUpdateDto; import com.rzyc.model.user.SysUser; import io.swagger.annotations.Api; diff --git a/inventory-gov/src/main/java/com/rzyc/controller/UploadController.java b/inventory-gov/src/main/java/com/rzyc/controller/UploadController.java index ab715fb..e449a91 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/UploadController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/UploadController.java @@ -6,7 +6,7 @@ import com.common.utils.model.*; import com.common.utils.upload.FileUpload; import com.rzyc.bean.file.FileResult; import com.rzyc.bean.file.FileResults; -import com.rzyc.model.Sysdocument; +import com.rzyc.model.sys.Sysdocument; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/inventory-gov/src/main/java/com/rzyc/controller/WorkController.java b/inventory-gov/src/main/java/com/rzyc/controller/WorkController.java index 24d3502..5fabad3 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/WorkController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/WorkController.java @@ -10,8 +10,9 @@ import com.github.pagehelper.PageHelper; import com.rzyc.bean.task.dto.*; import com.rzyc.bean.task.vo.*; import com.rzyc.config.MethodAnnotation; -import com.rzyc.mapper.OATaskMapper; import com.rzyc.model.*; +import com.rzyc.model.ent.EntEmEquipment; +import com.rzyc.model.ent.EntEmReservePlan; import com.rzyc.model.task.dto.TaskAddOrUpdateDto; import com.rzyc.model.user.SysUser; import com.rzyc.service.PcBusinessService; @@ -19,18 +20,13 @@ import io.swagger.annotations.*; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.beanutils.converters.DateConverter; -import org.apache.commons.beanutils.converters.SqlDateConverter; -import org.apache.poi.ss.formula.functions.Na; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.propertyeditors.CustomDateEditor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.Iterator; diff --git a/inventory-gov/src/main/java/com/rzyc/controller/WxContorller.java b/inventory-gov/src/main/java/com/rzyc/controller/WxContorller.java index 60a1acb..5450e58 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/WxContorller.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/WxContorller.java @@ -20,13 +20,12 @@ import com.rzyc.bean.user.dto.FactorListDto; import com.rzyc.enums.*; import com.rzyc.model.*; import com.rzyc.model.check.BookEntCheck; -import com.rzyc.model.check.BookEntHT; import com.rzyc.model.ent.SysEnterprise; +import com.rzyc.model.sys.SysOrg; import com.rzyc.model.user.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; diff --git a/inventory-gov/src/main/java/com/rzyc/controller/ent/OrganizationController.java b/inventory-gov/src/main/java/com/rzyc/controller/ent/OrganizationController.java index 3ac9997..8b8a703 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/ent/OrganizationController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/ent/OrganizationController.java @@ -21,7 +21,7 @@ import com.rzyc.bean.organization.vo.*; import com.rzyc.controller.BaseController; import com.rzyc.enums.OrgType; import com.rzyc.enums.RiskLevel; -import com.rzyc.model.SysOrg; +import com.rzyc.model.sys.SysOrg; import com.rzyc.model.ent.SysEnterprise; import com.rzyc.model.log.OrgLogDangerOperate; import com.rzyc.model.organization.*; diff --git a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCheckController.java b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCheckController.java index 66ce8ed..b155def 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCheckController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCheckController.java @@ -22,6 +22,8 @@ import com.rzyc.enums.NoticeType; import com.rzyc.model.*; import com.rzyc.model.check.*; import com.rzyc.model.ent.*; +import com.rzyc.model.sys.SysStatute; +import com.rzyc.model.sys.SysStatuteDesc; import com.rzyc.model.user.SysUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java index 147e266..9abfeef 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java @@ -24,6 +24,7 @@ import com.rzyc.model.ent.EntBillCon; import com.rzyc.model.ent.EntPromise; import com.rzyc.model.ent.EntUser; import com.rzyc.model.ent.SysEnterprise; +import com.rzyc.model.sys.SysOrg; import com.rzyc.model.user.SysUnit; import com.rzyc.model.user.SysUser; import com.rzyc.service.AssignmentTaskThread; diff --git a/inventory-gov/src/main/java/com/rzyc/controller/ent/WxProductionController.java b/inventory-gov/src/main/java/com/rzyc/controller/ent/WxProductionController.java index bb1c9c0..c17f3a4 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/ent/WxProductionController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/ent/WxProductionController.java @@ -7,9 +7,9 @@ import com.github.pagehelper.PageHelper; import com.rzyc.bean.ent.CertificatesPageDto; import com.rzyc.config.MethodAnnotation; import com.rzyc.controller.BaseController; -import com.rzyc.model.EntCertificates; -import com.rzyc.model.EntDevice; -import com.rzyc.model.EntUserCredential; +import com.rzyc.model.ent.EntCertificates; +import com.rzyc.model.ent.EntDevice; +import com.rzyc.model.ent.EntUserCredential; import com.rzyc.service.PcBusinessService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/inventory-gov/src/main/java/com/rzyc/service/AssignmentTaskThread.java b/inventory-gov/src/main/java/com/rzyc/service/AssignmentTaskThread.java index b7f56b3..d5e7127 100644 --- a/inventory-gov/src/main/java/com/rzyc/service/AssignmentTaskThread.java +++ b/inventory-gov/src/main/java/com/rzyc/service/AssignmentTaskThread.java @@ -9,19 +9,16 @@ import com.common.utils.model.Message; import com.common.utils.model.SingleResult; import com.rzyc.bean.OaTaskTime; import com.rzyc.enums.DelState; -import com.rzyc.mapper.EntPostListMapper; -import com.rzyc.mapper.EntPostTaskMapper; +import com.rzyc.mapper.ent.EntPostListMapper; +import com.rzyc.mapper.ent.EntPostTaskMapper; import com.rzyc.mapper.InPostItemMapper; import com.rzyc.mapper.InPostListMapper; import com.rzyc.mapper.ent.EntPostMapper; import com.rzyc.mapper.ent.EntUserMapper; import com.rzyc.mapper.ent.InEntListMapper; -import com.rzyc.model.EntPostList; -import com.rzyc.model.EntPostTask; -import com.rzyc.model.InPostItem; -import com.rzyc.model.InPostList; +import com.rzyc.model.ent.EntPostList; +import com.rzyc.model.ent.EntPostTask; import com.rzyc.model.dto.AddOrUpdateEntUserPostListDto; -import com.rzyc.model.ent.EntPost; import com.rzyc.model.ent.EntUser; import com.rzyc.model.ent.InEntList; import org.springframework.beans.BeanUtils; diff --git a/inventory-gov/src/main/java/com/rzyc/service/SaveEntPostAndUserThread.java b/inventory-gov/src/main/java/com/rzyc/service/SaveEntPostAndUserThread.java index 33648ea..e4f6968 100644 --- a/inventory-gov/src/main/java/com/rzyc/service/SaveEntPostAndUserThread.java +++ b/inventory-gov/src/main/java/com/rzyc/service/SaveEntPostAndUserThread.java @@ -5,19 +5,16 @@ import com.common.utils.RandomNumber; import com.common.utils.encryption.MD5; import com.rzyc.config.ConstantsConfigure; import com.rzyc.enums.PostListType; -import com.rzyc.mapper.EntPostDutyMapper; +import com.rzyc.mapper.ent.EntPostDutyMapper; import com.rzyc.mapper.ent.EntPostMapper; import com.rzyc.mapper.ent.EntUserMapper; import com.rzyc.mapper.ent.InListItemMapper; import com.rzyc.mapper.ent.InListMapper; -import com.rzyc.model.EntPostDuty; -import com.rzyc.model.InPost; -import com.rzyc.model.InPostItem; +import com.rzyc.model.ent.EntPostDuty; import com.rzyc.model.ent.EntPost; import com.rzyc.model.ent.EntUser; import com.rzyc.model.ent.InList; import com.rzyc.model.ent.InListItem; -import com.rzyc.utils.SpringUtil; import java.util.Date; import java.util.List; diff --git a/inventory-gov/src/main/java/com/rzyc/service/SaveIndustryPostThread.java b/inventory-gov/src/main/java/com/rzyc/service/SaveIndustryPostThread.java index 693e7de..791afff 100644 --- a/inventory-gov/src/main/java/com/rzyc/service/SaveIndustryPostThread.java +++ b/inventory-gov/src/main/java/com/rzyc/service/SaveIndustryPostThread.java @@ -5,18 +5,14 @@ import com.alibaba.excel.util.ListUtils; import com.common.utils.RandomNumber; import com.rzyc.enums.PostListType; import com.rzyc.mapper.*; +import com.rzyc.mapper.ent.EntPostDutyMapper; import com.rzyc.mapper.ent.EntPostMapper; import com.rzyc.mapper.ent.InListItemMapper; import com.rzyc.mapper.ent.SysEnterpriseMapper; import com.rzyc.model.*; -import com.rzyc.model.EasyExcel.EasyExcelEnterprise; -import com.rzyc.model.ent.InEntList; -import com.rzyc.model.ent.InList; -import com.rzyc.model.ent.InListItem; -import com.rzyc.model.ent.SysEnterprise; +import com.rzyc.model.ent.*; import org.springframework.beans.factory.annotation.Autowired; -import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/inventory-gov/src/main/java/com/rzyc/service/TaskService.java b/inventory-gov/src/main/java/com/rzyc/service/TaskService.java index bf5542b..d8da400 100644 --- a/inventory-gov/src/main/java/com/rzyc/service/TaskService.java +++ b/inventory-gov/src/main/java/com/rzyc/service/TaskService.java @@ -11,7 +11,10 @@ import com.rzyc.model.*; import com.rzyc.model.check.BookEntHT; import com.rzyc.model.check.BookenthtCompany; import com.rzyc.model.check.ChkPerson; +import com.rzyc.model.ent.EntPostTask; import com.rzyc.model.ent.SysEnterprise; +import com.rzyc.model.sys.SysWarning; +import com.rzyc.model.sys.SysWarningUser; import com.rzyc.model.user.ListFactor; import com.rzyc.model.user.ListPerform; import com.rzyc.model.user.SysUser; diff --git a/inventory-gov/src/main/resources/application.yml b/inventory-gov/src/main/resources/application.yml index cb53efc..48f6f2c 100644 --- a/inventory-gov/src/main/resources/application.yml +++ b/inventory-gov/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: yun #设定打包配置文件 + active: test #设定打包配置文件