From 3671f6c81a753798358ea6d057fff9507e7489f5 Mon Sep 17 00:00:00 2001 From: lcj <2331845269@qq.com> Date: Fri, 27 Jun 2025 20:00:51 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20=E6=B7=BB=E5=8A=A0=E5=88=86=E5=8C=85?= =?UTF-8?q?=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86=E7=9B=B8=E5=85=B3=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20[update]=20=E4=BF=AE=E6=94=B9=E5=88=86=E5=8C=85?= =?UTF-8?q?=E5=8C=85=E7=BB=93=E6=9E=84=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=9F=A5?= =?UTF-8?q?=E8=AF=86=E5=BA=93=E9=83=A8=E5=88=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-prod.yml | 16 +- .../src/main/resources/application.yml | 2 + .../SubConstructionUserConstant.java} | 4 +- .../SubConstructionUserController.java} | 102 +++--- .../SubConstructionUserFileController.java} | 52 +-- .../controller/SubContractorController.java} | 52 +-- .../SubContractorMaterialController.java | 108 +++++++ ...SubContractorMaterialRecordController.java | 108 +++++++ .../SubContractorToolController.java} | 42 +-- .../controller/SubSubcontractController.java} | 34 +- .../domain/SubConstructionUser.java} | 8 +- .../domain/SubConstructionUserFile.java} | 8 +- .../domain/SubContractor.java} | 8 +- .../domain/SubContractorMaterial.java | 90 ++++++ .../domain/SubContractorMaterialRecord.java | 83 +++++ .../domain/SubContractorTool.java} | 11 +- .../domain/SubContractorToolRecord.java | 18 +- .../domain/SubSubcontract.java} | 8 +- ...ubConstructionUserAttendanceMonthReq.java} | 4 +- ...ubConstructionUserAttendanceQueryReq.java} | 4 +- ...bConstructionUserBatchUpdateClockReq.java} | 4 +- ...ConstructionUserBatchUpdateStatusReq.java} | 4 +- .../SubConstructionUserChangeProjectReq.java} | 4 +- .../SubConstructionUserCreateReq.java} | 4 +- .../SubConstructionUserGisReq.java} | 4 +- .../SubConstructionUserQueryReq.java} | 4 +- .../SubConstructionUserUpdateClockReq.java} | 4 +- .../SubConstructionUserUpdateReq.java} | 4 +- .../SubConstructionUserUpdateSalaryReq.java} | 4 +- .../SubConstructionUserFileQueryReq.java} | 4 +- .../SubConstructionUserFileReq.java} | 4 +- .../SubConstructionUserFileSaveReq.java} | 6 +- .../SubConstructionUserFileTemplateReq.java} | 4 +- .../contractor/SubContractorCreateReq.java} | 4 +- .../contractor/SubContractorQueryReq.java} | 4 +- .../contractor/SubContractorUpdateReq.java} | 4 +- .../SubContractorMaterialCreateReq.java | 58 ++++ .../SubContractorMaterialQueryReq.java | 43 +++ .../SubContractorMaterialUpdateReq.java | 63 ++++ .../SubContractorMaterialRecordCreateReq.java | 57 ++++ .../SubContractorMaterialRecordQueryReq.java | 43 +++ .../SubContractorMaterialRecordUpdateReq.java | 62 ++++ .../SubContractorToolCreateReq.java} | 7 +- .../SubContractorToolQueryReq.java} | 4 +- .../SubContractorToolUpdateReq.java} | 7 +- .../SubContractorToolRecordCreateReq.java | 12 +- .../SubContractorToolRecordQueryReq.java | 5 + .../SubContractorToolRecordUpdateReq.java | 12 +- .../subcontract/SubSubcontractCreateReq.java} | 4 +- .../subcontract/SubSubcontractQueryReq.java} | 4 +- .../subcontract/SubSubcontractUpdateReq.java} | 4 +- .../SubConstructionUserFileStatusEnum.java} | 6 +- .../domain/enums/SubContractorRecordEnum.java | 23 ++ .../exportvo/BusConstructionUserExportVo.java | 6 +- .../SubConstructionUserAttendanceByDay.java} | 8 +- ...SubConstructionUserAttendanceMonthVo.java} | 6 +- ...SubConstructionUserAttendanceTotalVo.java} | 4 +- .../SubConstructionUserGisVo.java} | 4 +- .../SubConstructionUserVo.java} | 12 +- .../SubConstructionUserFileVo.java} | 8 +- .../vo/contractor/SubContractorVo.java} | 10 +- .../SubContractorMaterialVo.java | 97 ++++++ .../SubContractorMaterialRecordVo.java | 109 +++++++ .../contractortool/SubContractorToolVo.java} | 13 +- .../SubContractorToolRecordVo.java | 22 +- .../vo/subcontract/SubSubcontractVo.java} | 10 +- .../mapper/SubConstructionUserFileMapper.java | 15 + .../mapper/SubConstructionUserMapper.java | 15 + .../mapper/SubContractorMapper.java | 15 + .../mapper/SubContractorMaterialMapper.java | 15 + .../SubContractorMaterialRecordMapper.java | 15 + .../mapper/SubContractorToolMapper.java | 15 + .../mapper/SubSubcontractMapper.java | 15 + .../ISubConstructionUserFileService.java} | 28 +- .../service/ISubConstructionUserService.java} | 52 +-- .../ISubContractorMaterialRecordService.java | 98 ++++++ .../ISubContractorMaterialService.java | 98 ++++++ .../service/ISubContractorService.java} | 30 +- .../ISubContractorToolRecordService.java | 8 +- .../service/ISubContractorToolService.java} | 30 +- .../service/ISubSubcontractService.java} | 30 +- .../SubConstructionUserFileServiceImpl.java} | 114 +++---- .../impl/SubConstructionUserServiceImpl.java} | 258 +++++++-------- ...ubContractorMaterialRecordServiceImpl.java | 302 ++++++++++++++++++ .../SubContractorMaterialServiceImpl.java | 246 ++++++++++++++ .../impl/SubContractorServiceImpl.java} | 96 +++--- .../SubContractorToolRecordServiceImpl.java | 103 ++++-- .../impl/SubContractorToolServiceImpl.java} | 90 +++--- .../impl/SubSubcontractServiceImpl.java} | 108 +++---- .../changxiemanager/ChangxieController.java | 53 +++ .../mapper/BusConstructionUserFileMapper.java | 15 - .../mapper/BusConstructionUserMapper.java | 15 - .../project/mapper/BusContractorMapper.java | 15 - .../mapper/BusContractorToolMapper.java | 15 - .../project/mapper/BusSubcontractMapper.java | 15 - .../impl/BusAttendanceServiceImpl.java | 15 +- .../BusConstructionBlacklistServiceImpl.java | 8 +- .../service/impl/BusProjectServiceImpl.java | 16 +- .../impl/BusProjectTeamMemberServiceImpl.java | 43 +-- .../impl/BusProjectTeamServiceImpl.java | 12 +- .../QltKnowledgeDocumentController.java | 46 ++- .../QltKnowledgeDocumentFileQueryReq.java | 5 + .../service/IQltKnowledgeDocumentService.java | 20 +- .../impl/QltKnowledgeDocumentServiceImpl.java | 72 ++++- .../impl/QltQualityInspectionServiceImpl.java | 8 +- .../HseKnowledgeDocumentController.java | 29 +- .../HseKnowledgeDocumentFileQueryReq.java | 11 + .../service/IHseKnowledgeDocumentService.java | 20 +- .../impl/HseKnowledgeDocumentServiceImpl.java | 76 ++++- .../HseQuestionUserAnswerServiceImpl.java | 42 +-- .../impl/HseSafetyInspectionServiceImpl.java | 14 +- .../impl/HseTeamMeetingServiceImpl.java | 52 +-- .../SubConstructionUserFileMapper.xml} | 2 +- .../SubConstructionUserMapper.xml} | 2 +- .../SubContractorMapper.xml} | 2 +- .../SubContractorMaterialMapper.xml | 7 + .../SubContractorMaterialRecordMapper.xml | 7 + .../contractor/SubContractorToolMapper.xml | 7 + .../SubSubcontractMapper.xml} | 2 +- .../mapper/project/BusContractorMapper.xml | 7 - xinnengyuan/script/sql/menuInitValue.sql | 20 ++ xinnengyuan/script/sql/xinnengyuan.sql | 106 +++--- 123 files changed, 3119 insertions(+), 1009 deletions(-) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/constant/BusConstructionUserConstant.java => contractor/constant/SubConstructionUserConstant.java} (63%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/controller/BusConstructionUserController.java => contractor/controller/SubConstructionUserController.java} (53%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/controller/BusConstructionUserFileController.java => contractor/controller/SubConstructionUserFileController.java} (55%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/controller/BusContractorController.java => contractor/controller/SubContractorController.java} (58%) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubContractorMaterialController.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubContractorMaterialRecordController.java rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/controller/BusContractorToolController.java => contractor/controller/SubContractorToolController.java} (66%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/controller/BusSubcontractController.java => contractor/controller/SubSubcontractController.java} (68%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/BusConstructionUser.java => contractor/domain/SubConstructionUser.java} (94%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/BusConstructionUserFile.java => contractor/domain/SubConstructionUserFile.java} (79%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/BusContractor.java => contractor/domain/SubContractor.java} (90%) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractorMaterial.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractorMaterialRecord.java rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/BusContractorTool.java => contractor/domain/SubContractorTool.java} (83%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/BusSubcontract.java => contractor/domain/SubSubcontract.java} (88%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/dto/constructionuser/BusConstructionUserAttendanceMonthReq.java => contractor/domain/dto/constructionuser/SubConstructionUserAttendanceMonthReq.java} (78%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/dto/constructionuser/BusConstructionUserAttendanceQueryReq.java => contractor/domain/dto/constructionuser/SubConstructionUserAttendanceQueryReq.java} (83%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/dto/constructionuser/BusConstructionUserBatchUpdateClockReq.java => contractor/domain/dto/constructionuser/SubConstructionUserBatchUpdateClockReq.java} (82%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/dto/constructionuser/BusConstructionUserBatchUpdateStatusReq.java => contractor/domain/dto/constructionuser/SubConstructionUserBatchUpdateStatusReq.java} (82%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/dto/constructionuser/BusConstructionUserChangeProjectReq.java => contractor/domain/dto/constructionuser/SubConstructionUserChangeProjectReq.java} (83%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/dto/constructionuser/BusConstructionUserCreateReq.java => contractor/domain/dto/constructionuser/SubConstructionUserCreateReq.java} (94%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/dto/constructionuser/BusConstructionUserGisReq.java => contractor/domain/dto/constructionuser/SubConstructionUserGisReq.java} (75%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/dto/constructionuser/BusConstructionUserQueryReq.java => contractor/domain/dto/constructionuser/SubConstructionUserQueryReq.java} (93%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/dto/constructionuser/BusConstructionUserUpdateClockReq.java => contractor/domain/dto/constructionuser/SubConstructionUserUpdateClockReq.java} (81%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/dto/constructionuser/BusConstructionUserUpdateReq.java => contractor/domain/dto/constructionuser/SubConstructionUserUpdateReq.java} (94%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/dto/constructionuser/BusConstructionUserUpdateSalaryReq.java => contractor/domain/dto/constructionuser/SubConstructionUserUpdateSalaryReq.java} (77%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/dto/constructionuserfile/BusConstructionUserFileQueryReq.java => contractor/domain/dto/constructionuserfile/SubConstructionUserFileQueryReq.java} (78%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/dto/constructionuserfile/BusConstructionUserFileReq.java => contractor/domain/dto/constructionuserfile/SubConstructionUserFileReq.java} (74%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/dto/constructionuserfile/BusConstructionUserFileSaveReq.java => contractor/domain/dto/constructionuserfile/SubConstructionUserFileSaveReq.java} (64%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/dto/constructionuserfile/BusConstructionUserFileTemplateReq.java => contractor/domain/dto/constructionuserfile/SubConstructionUserFileTemplateReq.java} (86%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/dto/contractor/BusContractorCreateReq.java => contractor/domain/dto/contractor/SubContractorCreateReq.java} (88%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/dto/contractor/BusContractorQueryReq.java => contractor/domain/dto/contractor/SubContractorQueryReq.java} (87%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/dto/contractor/BusContractorUpdateReq.java => contractor/domain/dto/contractor/SubContractorUpdateReq.java} (88%) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractormaterial/SubContractorMaterialCreateReq.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractormaterial/SubContractorMaterialQueryReq.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractormaterial/SubContractorMaterialUpdateReq.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractormaterialrecord/SubContractorMaterialRecordCreateReq.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractormaterialrecord/SubContractorMaterialRecordQueryReq.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractormaterialrecord/SubContractorMaterialRecordUpdateReq.java rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/dto/contractortool/BusContractorToolCreateReq.java => contractor/domain/dto/contractortool/SubContractorToolCreateReq.java} (78%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/dto/contractortool/BusContractorToolQueryReq.java => contractor/domain/dto/contractortool/SubContractorToolQueryReq.java} (81%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/dto/contractortool/BusContractorToolUpdateReq.java => contractor/domain/dto/contractortool/SubContractorToolUpdateReq.java} (80%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/dto/subcontract/BusSubcontractCreateReq.java => contractor/domain/dto/subcontract/SubSubcontractCreateReq.java} (88%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/dto/subcontract/BusSubcontractQueryReq.java => contractor/domain/dto/subcontract/SubSubcontractQueryReq.java} (82%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/dto/subcontract/BusSubcontractUpdateReq.java => contractor/domain/dto/subcontract/SubSubcontractUpdateReq.java} (88%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/enums/BusConstructionUserFileStatusEnum.java => contractor/domain/enums/SubConstructionUserFileStatusEnum.java} (66%) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/enums/SubContractorRecordEnum.java rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project => contractor}/domain/exportvo/BusConstructionUserExportVo.java (94%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/vo/constructionuser/BusConstructionUserAttendanceByDay.java => contractor/domain/vo/constructionuser/SubConstructionUserAttendanceByDay.java} (85%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/vo/constructionuser/BusConstructionUserAttendanceMonthVo.java => contractor/domain/vo/constructionuser/SubConstructionUserAttendanceMonthVo.java} (78%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/vo/constructionuser/BusConstructionUserAttendanceTotalVo.java => contractor/domain/vo/constructionuser/SubConstructionUserAttendanceTotalVo.java} (87%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/vo/constructionuser/BusConstructionUserGisVo.java => contractor/domain/vo/constructionuser/SubConstructionUserGisVo.java} (77%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/vo/constructionuser/BusConstructionUserVo.java => contractor/domain/vo/constructionuser/SubConstructionUserVo.java} (93%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/vo/constructionuserfile/BusConstructionUserFileVo.java => contractor/domain/vo/constructionuserfile/SubConstructionUserFileVo.java} (82%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/vo/contractor/BusContractorVo.java => contractor/domain/vo/contractor/SubContractorVo.java} (86%) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/contractormaterial/SubContractorMaterialVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/contractormaterialrecord/SubContractorMaterialRecordVo.java rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/vo/contractortool/BusContractorToolVo.java => contractor/domain/vo/contractortool/SubContractorToolVo.java} (82%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/domain/vo/subcontract/BusSubcontractVo.java => contractor/domain/vo/subcontract/SubSubcontractVo.java} (80%) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubConstructionUserFileMapper.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubConstructionUserMapper.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubContractorMapper.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubContractorMaterialMapper.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubContractorMaterialRecordMapper.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubContractorToolMapper.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubSubcontractMapper.java rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/service/IBusConstructionUserFileService.java => contractor/service/ISubConstructionUserFileService.java} (57%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/service/IBusConstructionUserService.java => contractor/service/ISubConstructionUserService.java} (64%) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubContractorMaterialRecordService.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubContractorMaterialService.java rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/service/IBusContractorService.java => contractor/service/ISubContractorService.java} (67%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/service/IBusContractorToolService.java => contractor/service/ISubContractorToolService.java} (68%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/service/IBusSubcontractService.java => contractor/service/ISubSubcontractService.java} (67%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/service/impl/BusConstructionUserFileServiceImpl.java => contractor/service/impl/SubConstructionUserFileServiceImpl.java} (81%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/service/impl/BusConstructionUserServiceImpl.java => contractor/service/impl/SubConstructionUserServiceImpl.java} (81%) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubContractorMaterialRecordServiceImpl.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubContractorMaterialServiceImpl.java rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/service/impl/BusContractorServiceImpl.java => contractor/service/impl/SubContractorServiceImpl.java} (77%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/service/impl/BusContractorToolServiceImpl.java => contractor/service/impl/SubContractorToolServiceImpl.java} (70%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{project/service/impl/BusSubcontractServiceImpl.java => contractor/service/impl/SubSubcontractServiceImpl.java} (68%) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/manager/changxiemanager/ChangxieController.java delete mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusConstructionUserFileMapper.java delete mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusConstructionUserMapper.java delete mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusContractorMapper.java delete mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusContractorToolMapper.java delete mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusSubcontractMapper.java rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/{project/BusConstructionUserFileMapper.xml => contractor/SubConstructionUserFileMapper.xml} (66%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/{project/BusConstructionUserMapper.xml => contractor/SubConstructionUserMapper.xml} (67%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/{project/BusSubcontractMapper.xml => contractor/SubContractorMapper.xml} (69%) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/contractor/SubContractorMaterialMapper.xml create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/contractor/SubContractorMaterialRecordMapper.xml create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/contractor/SubContractorToolMapper.xml rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/{project/BusContractorToolMapper.xml => contractor/SubSubcontractMapper.xml} (73%) delete mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/project/BusContractorMapper.xml diff --git a/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml b/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml index a105dc4f..b2088195 100644 --- a/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml +++ b/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml @@ -283,6 +283,6 @@ sparta: url: http://119.3.204.120:8040 client-id: test client-secret: 115fcb08fa6742a1b086d9bb80a6ad59 -# 身份证加密密钥 +# 身份证加密密钥（32 位） id-card: encrypt-key: 7ae260d150a14027d2238a1cf80a48ef diff --git a/xinnengyuan/ruoyi-admin/src/main/resources/application-prod.yml b/xinnengyuan/ruoyi-admin/src/main/resources/application-prod.yml index c1c3c3c2..80ccd31f 100644 --- a/xinnengyuan/ruoyi-admin/src/main/resources/application-prod.yml +++ b/xinnengyuan/ruoyi-admin/src/main/resources/application-prod.yml @@ -267,13 +267,21 @@ justauth: redirect-uri: ${justauth.address}/social-callback?source=gitlab # 和风天气 https://dev.qweather.com/ weather: - key-id: xx - project-id: xx - private-key: xx - api-host: xx + key-id: T65EAABUXC + project-id: 2JTHPUQ5YY + private-key: MC4CAQAwBQYDK2VwBCIEIMAglX7IsxYiTeM+FXXnvCUsIggajeP4s8gAllewm6BN + api-host: n35rk53njv.re.qweatherapi.com # dxf转 geojson 执行文件名 dxf2GeoJson: file-name: main ys7: app-key: 3acf9f1a43dc4209841e0893003db0a2 app-secret: 4bbf3e9394f55d3af6e3af27b2d3db36 +# 斯巴达算法 +sparta: + url: http://119.3.204.120:8040 + client-id: test + client-secret: 115fcb08fa6742a1b086d9bb80a6ad59 +# 身份证加密密钥（32 位） +id-card: + encrypt-key: 7ae260d150a14027d2238a1cf80a48ef diff --git a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml index bb98de60..bd3023d8 100644 --- a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml +++ b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml @@ -121,7 +121,9 @@ security: - /*/api-docs/** - /warm-flow-ui/token-name - /other/ys7Device/webhook + # todo 仅测试 - /facility/matrix/** + - /changxie/callback # 多租户配置 tenant: diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/constant/BusConstructionUserConstant.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/constant/SubConstructionUserConstant.java similarity index 63% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/constant/BusConstructionUserConstant.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/constant/SubConstructionUserConstant.java index 4db5159b..7c5422fa 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/constant/BusConstructionUserConstant.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/constant/SubConstructionUserConstant.java @@ -1,10 +1,10 @@ -package org.dromara.project.constant; +package org.dromara.contractor.constant; /** * @author lcj * @date 2025/4/2 17:18 */ -public interface BusConstructionUserConstant { +public interface SubConstructionUserConstant { /** * 施工人员文件类型字典 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java similarity index 53% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserController.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java index d2c7a875..930555a9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java @@ -1,4 +1,4 @@ -package org.dromara.project.controller; +package org.dromara.contractor.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; @@ -15,13 +15,13 @@ import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; -import org.dromara.project.domain.exportvo.BusConstructionUserExportVo; -import org.dromara.project.domain.dto.constructionuser.*; -import org.dromara.project.domain.vo.constructionuser.BusConstructionUserAttendanceMonthVo; -import org.dromara.project.domain.vo.constructionuser.BusConstructionUserAttendanceTotalVo; -import org.dromara.project.domain.vo.constructionuser.BusConstructionUserGisVo; -import org.dromara.project.domain.vo.constructionuser.BusConstructionUserVo; -import org.dromara.project.service.IBusConstructionUserService; +import org.dromara.contractor.domain.dto.constructionuser.*; +import org.dromara.contractor.domain.exportvo.BusConstructionUserExportVo; +import org.dromara.contractor.domain.vo.constructionuser.SubConstructionUserAttendanceMonthVo; +import org.dromara.contractor.domain.vo.constructionuser.SubConstructionUserAttendanceTotalVo; +import org.dromara.contractor.domain.vo.constructionuser.SubConstructionUserGisVo; +import org.dromara.contractor.domain.vo.constructionuser.SubConstructionUserVo; +import org.dromara.contractor.service.ISubConstructionUserService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -37,46 +37,46 @@ import java.util.List; @RequiredArgsConstructor @RestController @RequestMapping("/project/constructionUser") -public class BusConstructionUserController extends BaseController { +public class SubConstructionUserController extends BaseController { - private final IBusConstructionUserService busConstructionUserService; + private final ISubConstructionUserService constructionUserService; /** * 查询施工人员列表 */ - @SaCheckPermission("project:constructionUser:list") + @SaCheckPermission("contractor:constructionUser:list") @GetMapping("/list") - public TableDataInfo list(BusConstructionUserQueryReq req, PageQuery pageQuery) { - return busConstructionUserService.queryPageList(req, pageQuery); + public TableDataInfo list(SubConstructionUserQueryReq req, PageQuery pageQuery) { + return constructionUserService.queryPageList(req, pageQuery); } /** * 查询每个施工人员总的考勤列表 */ - @SaCheckPermission("project:attendance:list") + @SaCheckPermission("contractor:attendance:list") @GetMapping("/list/attendance/total") - public TableDataInfo listAttendanceTotal(BusConstructionUserAttendanceQueryReq req, + public TableDataInfo listAttendanceTotal(SubConstructionUserAttendanceQueryReq req, PageQuery pageQuery) { - return busConstructionUserService.queryPageAttendanceList(req, pageQuery); + return constructionUserService.queryPageAttendanceList(req, pageQuery); } /** * 查询施工人员月份考勤列表 */ - @SaCheckPermission("project:constructionUser:list") + @SaCheckPermission("contractor:constructionUser:list") @GetMapping("/list/attendance/month") - public R> listAttendanceMonth(BusConstructionUserAttendanceMonthReq req) { - return R.ok(busConstructionUserService.queryAttendanceMonthList(req)); + public R> listAttendanceMonth(SubConstructionUserAttendanceMonthReq req) { + return R.ok(constructionUserService.queryAttendanceMonthList(req)); } /** * 导出施工人员列表 */ - @SaCheckPermission("project:constructionUser:export") + @SaCheckPermission("contractor:constructionUser:export") @Log(title = "施工人员", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(BusConstructionUserQueryReq req, HttpServletResponse response) { - List list = busConstructionUserService.queryList(req); + public void export(SubConstructionUserQueryReq req, HttpServletResponse response) { + List list = constructionUserService.queryList(req); ExcelUtil.exportExcel(list, "施工人员", BusConstructionUserExportVo.class, response); } @@ -85,97 +85,97 @@ public class BusConstructionUserController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("project:constructionUser:query") + @SaCheckPermission("contractor:constructionUser:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { - return R.ok(busConstructionUserService.queryById(id)); + return R.ok(constructionUserService.queryById(id)); } /** * 查询大屏施工人员信息 */ - @SaCheckPermission("project:constructionUser:query") + @SaCheckPermission("contractor:constructionUser:query") @GetMapping("/gis") - public R getGisData(BusConstructionUserGisReq req) { - return R.ok(busConstructionUserService.getGisData(req)); + public R getGisData(SubConstructionUserGisReq req) { + return R.ok(constructionUserService.getGisData(req)); } /** * 新增施工人员 */ - @SaCheckPermission("project:constructionUser:add") + @SaCheckPermission("contractor:constructionUser:add") @Log(title = "施工人员", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody BusConstructionUserCreateReq req) { - return R.ok(busConstructionUserService.insertByBo(req)); + public R add(@Validated(AddGroup.class) @RequestBody SubConstructionUserCreateReq req) { + return R.ok(constructionUserService.insertByBo(req)); } /** * 修改施工人员 */ - @SaCheckPermission("project:constructionUser:edit") + @SaCheckPermission("contractor:constructionUser:edit") @Log(title = "施工人员", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody BusConstructionUserUpdateReq req) { - return toAjax(busConstructionUserService.updateByBo(req)); + public R edit(@Validated(EditGroup.class) @RequestBody SubConstructionUserUpdateReq req) { + return toAjax(constructionUserService.updateByBo(req)); } /** * 修改施工人员工资 */ - @SaCheckPermission("project:constructionUser:edit") + @SaCheckPermission("contractor:constructionUser:edit") @Log(title = "施工人员", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/salary") - public R editSalary(@Validated(EditGroup.class) @RequestBody BusConstructionUserUpdateSalaryReq req) { - return toAjax(busConstructionUserService.updateSalary(req)); + public R editSalary(@Validated(EditGroup.class) @RequestBody SubConstructionUserUpdateSalaryReq req) { + return toAjax(constructionUserService.updateSalary(req)); } /** * 修改施工人员打卡状态 */ - @SaCheckPermission("project:constructionUser:edit") + @SaCheckPermission("contractor:constructionUser:edit") @Log(title = "施工人员", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/clock") - public R editClock(@Validated(EditGroup.class) @RequestBody BusConstructionUserUpdateClockReq req) { - return toAjax(busConstructionUserService.updateClock(req)); + public R editClock(@Validated(EditGroup.class) @RequestBody SubConstructionUserUpdateClockReq req) { + return toAjax(constructionUserService.updateClock(req)); } /** * 批量修改施工人员状态 */ - @SaCheckPermission("project:constructionUser:edit") + @SaCheckPermission("contractor:constructionUser:edit") @Log(title = "施工人员", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/batch/status") - public R batchUpdateStatus(@Validated(EditGroup.class) @RequestBody BusConstructionUserBatchUpdateStatusReq req) { - return toAjax(busConstructionUserService.batchUpdateStatus(req)); + public R batchUpdateStatus(@Validated(EditGroup.class) @RequestBody SubConstructionUserBatchUpdateStatusReq req) { + return toAjax(constructionUserService.batchUpdateStatus(req)); } /** * 根据项目id批量修改施工人员打卡状态 */ - @SaCheckPermission("project:constructionUser:edit") + @SaCheckPermission("contractor:constructionUser:edit") @Log(title = "施工人员", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/batch/clock") - public R batchUpdateClock(@Validated(EditGroup.class) @RequestBody BusConstructionUserBatchUpdateClockReq req) { - return toAjax(busConstructionUserService.batchUpdateClockByProjectId(req)); + public R batchUpdateClock(@Validated(EditGroup.class) @RequestBody SubConstructionUserBatchUpdateClockReq req) { + return toAjax(constructionUserService.batchUpdateClockByProjectId(req)); } /** * 施工人员迁移 */ - @SaCheckPermission("project:constructionUser:edit") + @SaCheckPermission("contractor:constructionUser:edit") @Log(title = "施工人员", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/change/project") - public R changeUserProject(@Validated(EditGroup.class) @RequestBody BusConstructionUserChangeProjectReq req) { - return toAjax(busConstructionUserService.changeUserProject(req)); + public R changeUserProject(@Validated(EditGroup.class) @RequestBody SubConstructionUserChangeProjectReq req) { + return toAjax(constructionUserService.changeUserProject(req)); } /** @@ -183,11 +183,11 @@ public class BusConstructionUserController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("project:constructionUser:remove") + @SaCheckPermission("contractor:constructionUser:remove") @Log(title = "施工人员", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { - return toAjax(busConstructionUserService.deleteWithValidByIds(List.of(ids), true)); + return toAjax(constructionUserService.deleteWithValidByIds(List.of(ids), true)); } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserFileController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserFileController.java similarity index 55% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserFileController.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserFileController.java index aca249c3..1d1c8d7f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserFileController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserFileController.java @@ -1,4 +1,4 @@ -package org.dromara.project.controller; +package org.dromara.contractor.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; @@ -10,11 +10,11 @@ import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.web.core.BaseController; -import org.dromara.project.domain.dto.constructionuserfile.BusConstructionUserFileQueryReq; -import org.dromara.project.domain.dto.constructionuserfile.BusConstructionUserFileSaveReq; -import org.dromara.project.domain.dto.constructionuserfile.BusConstructionUserFileTemplateReq; -import org.dromara.project.domain.vo.constructionuserfile.BusConstructionUserFileVo; -import org.dromara.project.service.IBusConstructionUserFileService; +import org.dromara.contractor.domain.dto.constructionuserfile.SubConstructionUserFileQueryReq; +import org.dromara.contractor.domain.dto.constructionuserfile.SubConstructionUserFileSaveReq; +import org.dromara.contractor.domain.dto.constructionuserfile.SubConstructionUserFileTemplateReq; +import org.dromara.contractor.domain.vo.constructionuserfile.SubConstructionUserFileVo; +import org.dromara.contractor.service.ISubConstructionUserFileService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -31,50 +31,50 @@ import java.util.List; @RequiredArgsConstructor @RestController @RequestMapping("/project/constructionUserFile") -public class BusConstructionUserFileController extends BaseController { +public class SubConstructionUserFileController extends BaseController { - private final IBusConstructionUserFileService busConstructionUserFileService; + private final ISubConstructionUserFileService constructionUserFileService; /** * 查询施工人员文件存储列表 */ - @SaCheckPermission("project:constructionUserFile:list") + @SaCheckPermission("contractor:constructionUserFile:list") @GetMapping("/list") - public R> list(BusConstructionUserFileQueryReq req) { - return R.ok(busConstructionUserFileService.queryList(req)); + public R> list(SubConstructionUserFileQueryReq req) { + return R.ok(constructionUserFileService.queryList(req)); } /** * 导出施工人员文件存储列表 */ - @SaCheckPermission("project:constructionUserFile:export") + @SaCheckPermission("contractor:constructionUserFile:export") @Log(title = "施工人员文件存储", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(BusConstructionUserFileQueryReq req, HttpServletResponse response) { - List list = busConstructionUserFileService.queryList(req); - ExcelUtil.exportExcel(list, "施工人员文件存储", BusConstructionUserFileVo.class, response); + public void export(SubConstructionUserFileQueryReq req, HttpServletResponse response) { + List list = constructionUserFileService.queryList(req); + ExcelUtil.exportExcel(list, "施工人员文件存储", SubConstructionUserFileVo.class, response); } /** * 下载施工人员文件存储模板 */ - @SaCheckPermission("project:constructionUserFile:export") + @SaCheckPermission("contractor:constructionUserFile:export") @Log(title = "施工人员文件存储", businessType = BusinessType.EXPORT) @RepeatSubmit() @PostMapping("/exportFileTemplate") - public void exportFileTemplate(BusConstructionUserFileTemplateReq req, HttpServletResponse response) { - busConstructionUserFileService.downloadFileTemplate(req, response); + public void exportFileTemplate(SubConstructionUserFileTemplateReq req, HttpServletResponse response) { + constructionUserFileService.downloadFileTemplate(req, response); } /** * 上传施工人员文件压缩包，批量导入存储施工人员文件 */ - @SaCheckPermission("project:constructionUserFile:edit") + @SaCheckPermission("contractor:constructionUserFile:edit") @Log(title = "施工人员文件存储", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/upload/zip") public R uploadFileZip(@RequestParam("file") MultipartFile file) { - Boolean result = busConstructionUserFileService.batchUploadFileByZip(file); + Boolean result = constructionUserFileService.batchUploadFileByZip(file); return R.ok(result); } @@ -83,21 +83,21 @@ public class BusConstructionUserFileController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("project:constructionUserFile:query") + @SaCheckPermission("contractor:constructionUserFile:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { - return R.ok(busConstructionUserFileService.queryById(id)); + return R.ok(constructionUserFileService.queryById(id)); } /** * 保存施工人员文件存储详情信息 */ - @SaCheckPermission("project:constructionUserFile:edit") + @SaCheckPermission("contractor:constructionUserFile:edit") @Log(title = "施工人员文件存储", businessType = BusinessType.INSERT) @PostMapping("/save") - public R save(@RequestBody BusConstructionUserFileSaveReq req) { - return R.ok(busConstructionUserFileService.saveFileList(req)); + public R save(@RequestBody SubConstructionUserFileSaveReq req) { + return R.ok(constructionUserFileService.saveFileList(req)); } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusContractorController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubContractorController.java similarity index 58% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusContractorController.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubContractorController.java index 07c7c93d..5f3f2fe5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusContractorController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubContractorController.java @@ -1,4 +1,4 @@ -package org.dromara.project.controller; +package org.dromara.contractor.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; @@ -15,11 +15,11 @@ import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; -import org.dromara.project.domain.dto.contractor.BusContractorCreateReq; -import org.dromara.project.domain.dto.contractor.BusContractorQueryReq; -import org.dromara.project.domain.dto.contractor.BusContractorUpdateReq; -import org.dromara.project.domain.vo.contractor.BusContractorVo; -import org.dromara.project.service.IBusContractorService; +import org.dromara.contractor.domain.dto.contractor.SubContractorCreateReq; +import org.dromara.contractor.domain.dto.contractor.SubContractorQueryReq; +import org.dromara.contractor.domain.dto.contractor.SubContractorUpdateReq; +import org.dromara.contractor.domain.vo.contractor.SubContractorVo; +import org.dromara.contractor.service.ISubContractorService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -35,28 +35,28 @@ import java.util.List; @RequiredArgsConstructor @RestController @RequestMapping("/project/contractor") -public class BusContractorController extends BaseController { +public class SubContractorController extends BaseController { - private final IBusContractorService busContractorService; + private final ISubContractorService contractorService; /** * 查询分包单位列表 */ - @SaCheckPermission("project:contractor:list") + @SaCheckPermission("contractor:contractor:list") @GetMapping("/list") - public TableDataInfo list(BusContractorQueryReq req, PageQuery pageQuery) { - return busContractorService.queryPageList(req, pageQuery); + public TableDataInfo list(SubContractorQueryReq req, PageQuery pageQuery) { + return contractorService.queryPageList(req, pageQuery); } /** * 导出分包单位列表 */ - @SaCheckPermission("project:contractor:export") + @SaCheckPermission("contractor:contractor:export") @Log(title = "分包单位", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(BusContractorQueryReq req, HttpServletResponse response) { - List list = busContractorService.queryList(req); - ExcelUtil.exportExcel(list, "分包单位", BusContractorVo.class, response); + public void export(SubContractorQueryReq req, HttpServletResponse response) { + List list = contractorService.queryList(req); + ExcelUtil.exportExcel(list, "分包单位", SubContractorVo.class, response); } /** @@ -64,33 +64,33 @@ public class BusContractorController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("project:contractor:query") + @SaCheckPermission("contractor:contractor:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { - return R.ok(busContractorService.queryById(id)); + return R.ok(contractorService.queryById(id)); } /** * 新增分包单位 */ - @SaCheckPermission("project:contractor:add") + @SaCheckPermission("contractor:contractor:add") @Log(title = "分包单位", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody BusContractorCreateReq req) { - return R.ok(busContractorService.insertByBo(req)); + public R add(@Validated(AddGroup.class) @RequestBody SubContractorCreateReq req) { + return R.ok(contractorService.insertByBo(req)); } /** * 修改分包单位 */ - @SaCheckPermission("project:contractor:edit") + @SaCheckPermission("contractor:contractor:edit") @Log(title = "分包单位", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody BusContractorUpdateReq req) { - return toAjax(busContractorService.updateByBo(req)); + public R edit(@Validated(EditGroup.class) @RequestBody SubContractorUpdateReq req) { + return toAjax(contractorService.updateByBo(req)); } /** @@ -98,11 +98,11 @@ public class BusContractorController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("project:contractor:remove") + @SaCheckPermission("contractor:contractor:remove") @Log(title = "分包单位", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { - return toAjax(busContractorService.deleteWithValidByIds(List.of(ids), true)); + return toAjax(contractorService.deleteWithValidByIds(List.of(ids), true)); } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubContractorMaterialController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubContractorMaterialController.java new file mode 100644 index 00000000..546b4b1c --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubContractorMaterialController.java @@ -0,0 +1,108 @@ +package org.dromara.contractor.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.contractor.domain.dto.contractormaterial.SubContractorMaterialCreateReq; +import org.dromara.contractor.domain.dto.contractormaterial.SubContractorMaterialQueryReq; +import org.dromara.contractor.domain.dto.contractormaterial.SubContractorMaterialUpdateReq; +import org.dromara.contractor.domain.vo.contractormaterial.SubContractorMaterialVo; +import org.dromara.contractor.service.ISubContractorMaterialService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 分包方物料 + * + * @author lcj + * @date 2025-06-27 + */ +@Validated +@RestController +@RequestMapping("/contractor/contractorMaterial") +public class SubContractorMaterialController extends BaseController { + + @Resource + private ISubContractorMaterialService contractorMaterialService; + + /** + * 查询分包方物料列表 + */ + @SaCheckPermission("contractor:contractorMaterial:list") + @GetMapping("/list") + public TableDataInfo list(SubContractorMaterialQueryReq req, PageQuery pageQuery) { + return contractorMaterialService.queryPageList(req, pageQuery); + } + + /** + * 导出分包方物料列表 + */ + @SaCheckPermission("contractor:contractorMaterial:export") + @Log(title = "分包方物料", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(SubContractorMaterialQueryReq req, HttpServletResponse response) { + List list = contractorMaterialService.queryList(req); + ExcelUtil.exportExcel(list, "分包方物料", SubContractorMaterialVo.class, response); + } + + /** + * 获取分包方物料详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("contractor:contractorMaterial:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(contractorMaterialService.queryById(id)); + } + + /** + * 新增分包方物料 + */ + @SaCheckPermission("contractor:contractorMaterial:add") + @Log(title = "分包方物料", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody SubContractorMaterialCreateReq req) { + return R.ok(contractorMaterialService.insertByBo(req)); + } + + /** + * 修改分包方物料 + */ + @SaCheckPermission("contractor:contractorMaterial:edit") + @Log(title = "分包方物料", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody SubContractorMaterialUpdateReq req) { + return toAjax(contractorMaterialService.updateByBo(req)); + } + + /** + * 删除分包方物料 + * + * @param ids 主键串 + */ + @SaCheckPermission("contractor:contractorMaterial:remove") + @Log(title = "分包方物料", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(contractorMaterialService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubContractorMaterialRecordController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubContractorMaterialRecordController.java new file mode 100644 index 00000000..ca51a559 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubContractorMaterialRecordController.java @@ -0,0 +1,108 @@ +package org.dromara.contractor.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.contractor.domain.dto.contractormaterialrecord.SubContractorMaterialRecordCreateReq; +import org.dromara.contractor.domain.dto.contractormaterialrecord.SubContractorMaterialRecordQueryReq; +import org.dromara.contractor.domain.dto.contractormaterialrecord.SubContractorMaterialRecordUpdateReq; +import org.dromara.contractor.domain.vo.contractormaterialrecord.SubContractorMaterialRecordVo; +import org.dromara.contractor.service.ISubContractorMaterialRecordService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 分包方物料记录 + * + * @author lcj + * @date 2025-06-27 + */ +@Validated +@RestController +@RequestMapping("/contractor/contractorMaterialRecord") +public class SubContractorMaterialRecordController extends BaseController { + + @Resource + private ISubContractorMaterialRecordService subContractorMaterialRecordService; + + /** + * 查询分包方物料记录列表 + */ + @SaCheckPermission("contractor:contractorMaterialRecord:list") + @GetMapping("/list") + public TableDataInfo list(SubContractorMaterialRecordQueryReq req, PageQuery pageQuery) { + return subContractorMaterialRecordService.queryPageList(req, pageQuery); + } + + /** + * 导出分包方物料记录列表 + */ + @SaCheckPermission("contractor:contractorMaterialRecord:export") + @Log(title = "分包方物料记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(SubContractorMaterialRecordQueryReq req, HttpServletResponse response) { + List list = subContractorMaterialRecordService.queryList(req); + ExcelUtil.exportExcel(list, "分包方物料记录", SubContractorMaterialRecordVo.class, response); + } + + /** + * 获取分包方物料记录详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("contractor:contractorMaterialRecord:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(subContractorMaterialRecordService.queryById(id)); + } + + /** + * 新增分包方物料记录 + */ + @SaCheckPermission("contractor:contractorMaterialRecord:add") + @Log(title = "分包方物料记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody SubContractorMaterialRecordCreateReq req) { + return R.ok(subContractorMaterialRecordService.insertByBo(req)); + } + + /** + * 修改分包方物料记录 + */ + @SaCheckPermission("contractor:contractorMaterialRecord:edit") + @Log(title = "分包方物料记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody SubContractorMaterialRecordUpdateReq req) { + return toAjax(subContractorMaterialRecordService.updateByBo(req)); + } + + /** + * 删除分包方物料记录 + * + * @param ids 主键串 + */ + @SaCheckPermission("contractor:contractorMaterialRecord:remove") + @Log(title = "分包方物料记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(subContractorMaterialRecordService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusContractorToolController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubContractorToolController.java similarity index 66% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusContractorToolController.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubContractorToolController.java index 9e01ae13..61a9dc91 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusContractorToolController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubContractorToolController.java @@ -1,4 +1,4 @@ -package org.dromara.project.controller; +package org.dromara.contractor.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.annotation.Resource; @@ -15,11 +15,11 @@ import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; -import org.dromara.project.domain.dto.contractortool.BusContractorToolCreateReq; -import org.dromara.project.domain.dto.contractortool.BusContractorToolQueryReq; -import org.dromara.project.domain.dto.contractortool.BusContractorToolUpdateReq; -import org.dromara.project.domain.vo.contractortool.BusContractorToolVo; -import org.dromara.project.service.IBusContractorToolService; +import org.dromara.contractor.domain.dto.contractortool.SubContractorToolCreateReq; +import org.dromara.contractor.domain.dto.contractortool.SubContractorToolQueryReq; +import org.dromara.contractor.domain.dto.contractortool.SubContractorToolUpdateReq; +import org.dromara.contractor.domain.vo.contractortool.SubContractorToolVo; +import org.dromara.contractor.service.ISubContractorToolService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -34,29 +34,29 @@ import java.util.List; @Validated @RestController @RequestMapping("/project/contractorTool") -public class BusContractorToolController extends BaseController { +public class SubContractorToolController extends BaseController { @Resource - private IBusContractorToolService busContractorToolService; + private ISubContractorToolService busContractorToolService; /** * 查询分包方工器具列表 */ - @SaCheckPermission("project:contractorTool:list") + @SaCheckPermission("contractor:contractorTool:list") @GetMapping("/list") - public TableDataInfo list(BusContractorToolQueryReq req, PageQuery pageQuery) { + public TableDataInfo list(SubContractorToolQueryReq req, PageQuery pageQuery) { return busContractorToolService.queryPageList(req, pageQuery); } /** * 导出分包方工器具列表 */ - @SaCheckPermission("project:contractorTool:export") + @SaCheckPermission("contractor:contractorTool:export") @Log(title = "分包方工器具", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(BusContractorToolQueryReq req, HttpServletResponse response) { - List list = busContractorToolService.queryList(req); - ExcelUtil.exportExcel(list, "分包方工器具", BusContractorToolVo.class, response); + public void export(SubContractorToolQueryReq req, HttpServletResponse response) { + List list = busContractorToolService.queryList(req); + ExcelUtil.exportExcel(list, "分包方工器具", SubContractorToolVo.class, response); } /** @@ -64,9 +64,9 @@ public class BusContractorToolController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("project:contractorTool:query") + @SaCheckPermission("contractor:contractorTool:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(busContractorToolService.queryById(id)); } @@ -74,22 +74,22 @@ public class BusContractorToolController extends BaseController { /** * 新增分包方工器具 */ - @SaCheckPermission("project:contractorTool:add") + @SaCheckPermission("contractor:contractorTool:add") @Log(title = "分包方工器具", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody BusContractorToolCreateReq req) { + public R add(@Validated(AddGroup.class) @RequestBody SubContractorToolCreateReq req) { return R.ok(busContractorToolService.insertByBo(req)); } /** * 修改分包方工器具 */ - @SaCheckPermission("project:contractorTool:edit") + @SaCheckPermission("contractor:contractorTool:edit") @Log(title = "分包方工器具", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody BusContractorToolUpdateReq req) { + public R edit(@Validated(EditGroup.class) @RequestBody SubContractorToolUpdateReq req) { return toAjax(busContractorToolService.updateByBo(req)); } @@ -98,7 +98,7 @@ public class BusContractorToolController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("project:contractorTool:remove") + @SaCheckPermission("contractor:contractorTool:remove") @Log(title = "分包方工器具", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusSubcontractController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubSubcontractController.java similarity index 68% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusSubcontractController.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubSubcontractController.java index 3948322c..74ccca6e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusSubcontractController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubSubcontractController.java @@ -1,4 +1,4 @@ -package org.dromara.project.controller; +package org.dromara.contractor.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.annotation.Resource; @@ -13,11 +13,11 @@ import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; -import org.dromara.project.domain.dto.subcontract.BusSubcontractCreateReq; -import org.dromara.project.domain.dto.subcontract.BusSubcontractQueryReq; -import org.dromara.project.domain.dto.subcontract.BusSubcontractUpdateReq; -import org.dromara.project.domain.vo.subcontract.BusSubcontractVo; -import org.dromara.project.service.IBusSubcontractService; +import org.dromara.contractor.domain.dto.subcontract.SubSubcontractCreateReq; +import org.dromara.contractor.domain.dto.subcontract.SubSubcontractQueryReq; +import org.dromara.contractor.domain.dto.subcontract.SubSubcontractUpdateReq; +import org.dromara.contractor.domain.vo.subcontract.SubSubcontractVo; +import org.dromara.contractor.service.ISubSubcontractService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -32,17 +32,17 @@ import java.util.List; @Validated @RestController @RequestMapping("/project/subcontract") -public class BusSubcontractController extends BaseController { +public class SubSubcontractController extends BaseController { @Resource - private IBusSubcontractService subcontractService; + private ISubSubcontractService subcontractService; /** * 查询分包合同列表 */ - @SaCheckPermission("project:subcontract:list") + @SaCheckPermission("contractor:subcontract:list") @GetMapping("/list") - public TableDataInfo list(BusSubcontractQueryReq req, PageQuery pageQuery) { + public TableDataInfo list(SubSubcontractQueryReq req, PageQuery pageQuery) { return subcontractService.queryPageList(req, pageQuery); } @@ -51,9 +51,9 @@ public class BusSubcontractController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("project:subcontract:query") + @SaCheckPermission("contractor:subcontract:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(subcontractService.queryById(id)); } @@ -61,22 +61,22 @@ public class BusSubcontractController extends BaseController { /** * 新增分包合同 */ - @SaCheckPermission("project:subcontract:add") + @SaCheckPermission("contractor:subcontract:add") @Log(title = "分包合同", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody BusSubcontractCreateReq req) { + public R add(@Validated(AddGroup.class) @RequestBody SubSubcontractCreateReq req) { return R.ok(subcontractService.insertByBo(req)); } /** * 修改分包合同 */ - @SaCheckPermission("project:subcontract:edit") + @SaCheckPermission("contractor:subcontract:edit") @Log(title = "分包合同", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody BusSubcontractUpdateReq req) { + public R edit(@Validated(EditGroup.class) @RequestBody SubSubcontractUpdateReq req) { return toAjax(subcontractService.updateByBo(req)); } @@ -85,7 +85,7 @@ public class BusSubcontractController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("project:subcontract:remove") + @SaCheckPermission("contractor:subcontract:remove") @Log(title = "分包合同", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusConstructionUser.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubConstructionUser.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusConstructionUser.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubConstructionUser.java index 059745a9..8e5a4f34 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusConstructionUser.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubConstructionUser.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain; +package org.dromara.contractor.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; @@ -11,15 +11,15 @@ import java.io.Serial; import java.util.Date; /** - * 施工人员对象 bus_construction_user + * 施工人员对象 sub_construction_user * * @author lcj * @date 2025-03-07 */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("bus_construction_user") -public class BusConstructionUser extends BaseEntity { +@TableName("sub_construction_user") +public class SubConstructionUser extends BaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusConstructionUserFile.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubConstructionUserFile.java similarity index 79% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusConstructionUserFile.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubConstructionUserFile.java index 524a1de8..bdddb92f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusConstructionUserFile.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubConstructionUserFile.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain; +package org.dromara.contractor.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -9,14 +9,14 @@ import java.io.Serializable; import java.util.Date; /** - * 施工人员文件存储对象 bus_construction_user_file + * 施工人员文件存储对象 sub_construction_user_file * * @author lcj * @date 2025-04-01 */ @Data -@TableName("bus_construction_user_file") -public class BusConstructionUserFile implements Serializable { +@TableName("sub_construction_user_file") +public class SubConstructionUserFile implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusContractor.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractor.java similarity index 90% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusContractor.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractor.java index a85f5ff1..9fc44afd 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusContractor.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractor.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain; +package org.dromara.contractor.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; @@ -11,15 +11,15 @@ import java.io.Serial; import java.util.Date; /** - * 分包单位对象 bus_contractor + * 分包单位对象 sub_contractor * * @author lcj * @date 2025-03-07 */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("bus_contractor") -public class BusContractor extends BaseEntity { +@TableName("sub_contractor") +public class SubContractor extends BaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractorMaterial.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractorMaterial.java new file mode 100644 index 00000000..24370f17 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractorMaterial.java @@ -0,0 +1,90 @@ +package org.dromara.contractor.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 分包方物料对象 sub_contractor_material + * + * @author lcj + * @date 2025-06-27 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sub_contractor_material") +public class SubContractorMaterial extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id") + private Long id; + + /** + * 项目id + */ + private Long projectId; + + /** + * 分包方id + */ + private Long contractorId; + + /** + * 物料名称 + */ + private String materialName; + + /** + * 物料类型 + */ + private String materialType; + + /** + * 物料型号 + */ + private String materialModel; + + /** + * 物料数量 + */ + private BigDecimal materialNumber; + + /** + * 物料单位 + */ + private String materialUnit; + + /** + * 文件 + */ + private String file; + + /** + * 备注 + */ + private String remark; + + /** + * 删除时间 + */ + private Date deletedAt; + + /** + * 是否删除（0正常 1删除） + */ + @TableLogic + private Long isDelete; + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractorMaterialRecord.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractorMaterialRecord.java new file mode 100644 index 00000000..9370e908 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractorMaterialRecord.java @@ -0,0 +1,83 @@ +package org.dromara.contractor.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 分包方物料记录对象 sub_contractor_material_record + * + * @author lcj + * @date 2025-06-27 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sub_contractor_material_record") +public class SubContractorMaterialRecord extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id") + private Long id; + + /** + * 项目id + */ + private Long projectId; + + /** + * 分包方id + */ + private Long contractorId; + + /** + * 物料id + */ + private Long contractorMaterialId; + + /** + * 记录类型(1到货计划 2使用情况) + */ + private String recordType; + + /** + * 记录时间 + */ + private Date recordTime; + + /** + * 数量 + */ + private BigDecimal recordNumber; + + /** + * 剩余数量(到货 使用) + */ + private BigDecimal remainingNumber; + + /** + * 使用位置或构件部位(使用情况) + */ + private String usedPosition; + + /** + * 相关附件 + */ + private String file; + + /** + * 备注 + */ + private String remark; + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusContractorTool.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractorTool.java similarity index 83% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusContractorTool.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractorTool.java index 244f18b9..9f9c92c2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusContractorTool.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractorTool.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain; +package org.dromara.contractor.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; @@ -8,18 +8,19 @@ import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; +import java.math.BigDecimal; import java.util.Date; /** - * 分包方工器具对象 bus_contractor_tool + * 分包方工器具对象 sub_contractor_tool * * @author lcj * @date 2025-06-26 */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("bus_contractor_tool") -public class BusContractorTool extends BaseEntity { +@TableName("sub_contractor_tool") +public class SubContractorTool extends BaseEntity { @Serial private static final long serialVersionUID = 1L; @@ -58,7 +59,7 @@ public class BusContractorTool extends BaseEntity { /** * 工具数量 */ - private String toolNumber; + private BigDecimal toolNumber; /** * 文件 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractorToolRecord.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractorToolRecord.java index ecad5d76..b364dacf 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractorToolRecord.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractorToolRecord.java @@ -2,11 +2,14 @@ package org.dromara.contractor.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.json.handler.BigDecimalToIntegerSerializer; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; +import java.math.BigDecimal; import java.util.Date; /** @@ -50,9 +53,16 @@ public class SubContractorToolRecord extends BaseEntity { private String recordType; /** - * 进场工器具数量 + * 记录工器具数量 */ - private String toolNumber; + @JsonSerialize(using = BigDecimalToIntegerSerializer.class) + private BigDecimal recordNumber; + + /** + * 剩余数量 + */ + @JsonSerialize(using = BigDecimalToIntegerSerializer.class) + private BigDecimal remainingNumber; /** * 检测编号 @@ -80,8 +90,8 @@ public class SubContractorToolRecord extends BaseEntity { private String remark; /** - * 进场时间 + * 记录时间 */ - private Date entryTime; + private Date recordTime; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusSubcontract.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubSubcontract.java similarity index 88% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusSubcontract.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubSubcontract.java index 50c39e26..110b264a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusSubcontract.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubSubcontract.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain; +package org.dromara.contractor.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -10,14 +10,14 @@ import java.math.BigDecimal; import java.util.Date; /** - * 分包合同对象 bus_subcontract + * 分包合同对象 sub_subcontract * * @author lcj * @date 2025-06-25 */ @Data -@TableName("bus_subcontract") -public class BusSubcontract implements Serializable { +@TableName("sub_subcontract") +public class SubSubcontract implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserAttendanceMonthReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserAttendanceMonthReq.java similarity index 78% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserAttendanceMonthReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserAttendanceMonthReq.java index 66ab106f..0f08be37 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserAttendanceMonthReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserAttendanceMonthReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.dto.constructionuser; +package org.dromara.contractor.domain.dto.constructionuser; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -11,7 +11,7 @@ import java.io.Serializable; * @date 2025/4/7 15:04 */ @Data -public class BusConstructionUserAttendanceMonthReq implements Serializable { +public class SubConstructionUserAttendanceMonthReq implements Serializable { @Serial private static final long serialVersionUID = -1496942176392426636L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserAttendanceQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserAttendanceQueryReq.java similarity index 83% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserAttendanceQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserAttendanceQueryReq.java index 4e0928e4..5022ad9e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserAttendanceQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserAttendanceQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.dto.constructionuser; +package org.dromara.contractor.domain.dto.constructionuser; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -11,7 +11,7 @@ import java.io.Serializable; * @date 2025/4/7 10:52 */ @Data -public class BusConstructionUserAttendanceQueryReq implements Serializable { +public class SubConstructionUserAttendanceQueryReq implements Serializable { @Serial private static final long serialVersionUID = -6634291825924626633L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserBatchUpdateClockReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserBatchUpdateClockReq.java similarity index 82% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserBatchUpdateClockReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserBatchUpdateClockReq.java index be35018f..53fa4c8c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserBatchUpdateClockReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserBatchUpdateClockReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.dto.constructionuser; +package org.dromara.contractor.domain.dto.constructionuser; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -13,7 +13,7 @@ import java.io.Serializable; * @date 2025/4/2 9:14 */ @Data -public class BusConstructionUserBatchUpdateClockReq implements Serializable { +public class SubConstructionUserBatchUpdateClockReq implements Serializable { @Serial private static final long serialVersionUID = -5803749609177642435L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserBatchUpdateStatusReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserBatchUpdateStatusReq.java similarity index 82% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserBatchUpdateStatusReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserBatchUpdateStatusReq.java index 10a0ec6e..b0e580b0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserBatchUpdateStatusReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserBatchUpdateStatusReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.dto.constructionuser; +package org.dromara.contractor.domain.dto.constructionuser; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -14,7 +14,7 @@ import java.util.List; * @date 2025/4/1 17:11 */ @Data -public class BusConstructionUserBatchUpdateStatusReq implements Serializable { +public class SubConstructionUserBatchUpdateStatusReq implements Serializable { @Serial private static final long serialVersionUID = -3756685899069233313L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserChangeProjectReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserChangeProjectReq.java similarity index 83% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserChangeProjectReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserChangeProjectReq.java index bdf0cd88..8af4833b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserChangeProjectReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserChangeProjectReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.dto.constructionuser; +package org.dromara.contractor.domain.dto.constructionuser; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -13,7 +13,7 @@ import java.io.Serializable; * @date 2025/3/31 14:50 */ @Data -public class BusConstructionUserChangeProjectReq implements Serializable { +public class SubConstructionUserChangeProjectReq implements Serializable { @Serial private static final long serialVersionUID = -2638471692809830501L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserCreateReq.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserCreateReq.java index adf5298a..2ce30d77 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.dto.constructionuser; +package org.dromara.contractor.domain.dto.constructionuser; import lombok.Data; @@ -10,7 +10,7 @@ import java.io.Serializable; * @date 2025/3/5 14:05 */ @Data -public class BusConstructionUserCreateReq implements Serializable { +public class SubConstructionUserCreateReq implements Serializable { @Serial private static final long serialVersionUID = -7603153089205421154L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserGisReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserGisReq.java similarity index 75% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserGisReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserGisReq.java index 11de37a1..31212de3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserGisReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserGisReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.dto.constructionuser; +package org.dromara.contractor.domain.dto.constructionuser; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -11,7 +11,7 @@ import java.io.Serializable; * @date 2025/4/28 9:40 */ @Data -public class BusConstructionUserGisReq implements Serializable { +public class SubConstructionUserGisReq implements Serializable { @Serial private static final long serialVersionUID = 2487357135566518535L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserQueryReq.java similarity index 93% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserQueryReq.java index 1a785d31..6f3df8be 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.dto.constructionuser; +package org.dromara.contractor.domain.dto.constructionuser; import lombok.Data; @@ -10,7 +10,7 @@ import java.io.Serializable; * @date 2025/3/5 14:31 */ @Data -public class BusConstructionUserQueryReq implements Serializable { +public class SubConstructionUserQueryReq implements Serializable { @Serial private static final long serialVersionUID = 3252651952758479341L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserUpdateClockReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserUpdateClockReq.java similarity index 81% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserUpdateClockReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserUpdateClockReq.java index 9d839aad..24136550 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserUpdateClockReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserUpdateClockReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.dto.constructionuser; +package org.dromara.contractor.domain.dto.constructionuser; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -13,7 +13,7 @@ import java.io.Serializable; * @date 2025/4/2 9:14 */ @Data -public class BusConstructionUserUpdateClockReq implements Serializable { +public class SubConstructionUserUpdateClockReq implements Serializable { @Serial private static final long serialVersionUID = -5803749609177642435L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserUpdateReq.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserUpdateReq.java index 9e0e6be1..fade0689 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.dto.constructionuser; +package org.dromara.contractor.domain.dto.constructionuser; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -11,7 +11,7 @@ import java.io.Serializable; * @date 2025/3/5 15:04 */ @Data -public class BusConstructionUserUpdateReq implements Serializable { +public class SubConstructionUserUpdateReq implements Serializable { @Serial private static final long serialVersionUID = -8022860866890925958L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserUpdateSalaryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserUpdateSalaryReq.java similarity index 77% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserUpdateSalaryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserUpdateSalaryReq.java index 80ab2892..8e251544 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserUpdateSalaryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserUpdateSalaryReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.dto.constructionuser; +package org.dromara.contractor.domain.dto.constructionuser; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -11,7 +11,7 @@ import java.io.Serializable; * @date 2025/4/2 11:35 */ @Data -public class BusConstructionUserUpdateSalaryReq implements Serializable { +public class SubConstructionUserUpdateSalaryReq implements Serializable { @Serial private static final long serialVersionUID = -1300674086812422523L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserfile/BusConstructionUserFileQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuserfile/SubConstructionUserFileQueryReq.java similarity index 78% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserfile/BusConstructionUserFileQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuserfile/SubConstructionUserFileQueryReq.java index 60fd30fc..b410cfcd 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserfile/BusConstructionUserFileQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuserfile/SubConstructionUserFileQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.dto.constructionuserfile; +package org.dromara.contractor.domain.dto.constructionuserfile; import lombok.Data; @@ -10,7 +10,7 @@ import java.io.Serializable; * @date 2025/4/1 10:06 */ @Data -public class BusConstructionUserFileQueryReq implements Serializable { +public class SubConstructionUserFileQueryReq implements Serializable { @Serial private static final long serialVersionUID = 552027602186820020L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserfile/BusConstructionUserFileReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuserfile/SubConstructionUserFileReq.java similarity index 74% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserfile/BusConstructionUserFileReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuserfile/SubConstructionUserFileReq.java index c6b7d80b..dabb50bf 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserfile/BusConstructionUserFileReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuserfile/SubConstructionUserFileReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.dto.constructionuserfile; +package org.dromara.contractor.domain.dto.constructionuserfile; import lombok.AllArgsConstructor; import lombok.Data; @@ -11,7 +11,7 @@ import lombok.NoArgsConstructor; @Data @NoArgsConstructor @AllArgsConstructor -public class BusConstructionUserFileReq { +public class SubConstructionUserFileReq { /** * 文件类型 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserfile/BusConstructionUserFileSaveReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuserfile/SubConstructionUserFileSaveReq.java similarity index 64% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserfile/BusConstructionUserFileSaveReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuserfile/SubConstructionUserFileSaveReq.java index 3a4614ed..42bcb558 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserfile/BusConstructionUserFileSaveReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuserfile/SubConstructionUserFileSaveReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.dto.constructionuserfile; +package org.dromara.contractor.domain.dto.constructionuserfile; import lombok.Data; @@ -11,7 +11,7 @@ import java.util.List; * @date 2025/4/1 10:01 */ @Data -public class BusConstructionUserFileSaveReq implements Serializable { +public class SubConstructionUserFileSaveReq implements Serializable { @Serial private static final long serialVersionUID = 4319620202781413796L; @@ -24,6 +24,6 @@ public class BusConstructionUserFileSaveReq implements Serializable { /** * 文件列表 */ - private List fileList; + private List fileList; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserfile/BusConstructionUserFileTemplateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuserfile/SubConstructionUserFileTemplateReq.java similarity index 86% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserfile/BusConstructionUserFileTemplateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuserfile/SubConstructionUserFileTemplateReq.java index dd78ac84..d5b232d4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserfile/BusConstructionUserFileTemplateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuserfile/SubConstructionUserFileTemplateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.dto.constructionuserfile; +package org.dromara.contractor.domain.dto.constructionuserfile; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -12,7 +12,7 @@ import java.util.List; * @date 2025/4/9 9:25 */ @Data -public class BusConstructionUserFileTemplateReq implements Serializable { +public class SubConstructionUserFileTemplateReq implements Serializable { @Serial private static final long serialVersionUID = -6895109153171403950L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractor/BusContractorCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractor/SubContractorCreateReq.java similarity index 88% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractor/BusContractorCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractor/SubContractorCreateReq.java index 285fd1ed..eaa56773 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractor/BusContractorCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractor/SubContractorCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.dto.contractor; +package org.dromara.contractor.domain.dto.contractor; import lombok.Data; @@ -11,7 +11,7 @@ import java.util.Map; * @date 2025/3/5 14:05 */ @Data -public class BusContractorCreateReq implements Serializable { +public class SubContractorCreateReq implements Serializable { @Serial private static final long serialVersionUID = -7603153089205421154L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractor/BusContractorQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractor/SubContractorQueryReq.java similarity index 87% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractor/BusContractorQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractor/SubContractorQueryReq.java index 31386c45..d993e1a2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractor/BusContractorQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractor/SubContractorQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.dto.contractor; +package org.dromara.contractor.domain.dto.contractor; import lombok.Data; @@ -10,7 +10,7 @@ import java.io.Serializable; * @date 2025/3/5 14:31 */ @Data -public class BusContractorQueryReq implements Serializable { +public class SubContractorQueryReq implements Serializable { @Serial private static final long serialVersionUID = 3252651952758479341L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractor/BusContractorUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractor/SubContractorUpdateReq.java similarity index 88% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractor/BusContractorUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractor/SubContractorUpdateReq.java index ed16b7f3..68c3b188 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractor/BusContractorUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractor/SubContractorUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.dto.contractor; +package org.dromara.contractor.domain.dto.contractor; import lombok.Data; @@ -11,7 +11,7 @@ import java.util.Map; * @date 2025/3/5 15:04 */ @Data -public class BusContractorUpdateReq implements Serializable { +public class SubContractorUpdateReq implements Serializable { @Serial private static final long serialVersionUID = -8022860866890925958L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractormaterial/SubContractorMaterialCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractormaterial/SubContractorMaterialCreateReq.java new file mode 100644 index 00000000..ca37559f --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractormaterial/SubContractorMaterialCreateReq.java @@ -0,0 +1,58 @@ +package org.dromara.contractor.domain.dto.contractormaterial; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author lcj + * @date 2025/6/27 14:18 + */ +@Data +public class SubContractorMaterialCreateReq implements Serializable { + + @Serial + private static final long serialVersionUID = -5984785792671407395L; + + /** + * 项目id + */ + private Long projectId; + + /** + * 分包方id + */ + private Long contractorId; + + /** + * 物料名称 + */ + private String materialName; + + /** + * 物料类型 + */ + private String materialType; + + /** + * 物料型号 + */ + private String materialModel; + + /** + * 物料单位 + */ + private String materialUnit; + + /** + * 文件 + */ + private String file; + + /** + * 备注 + */ + private String remark; + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractormaterial/SubContractorMaterialQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractormaterial/SubContractorMaterialQueryReq.java new file mode 100644 index 00000000..557a9b65 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractormaterial/SubContractorMaterialQueryReq.java @@ -0,0 +1,43 @@ +package org.dromara.contractor.domain.dto.contractormaterial; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author lcj + * @date 2025/6/27 14:20 + */ +@Data +public class SubContractorMaterialQueryReq implements Serializable { + + @Serial + private static final long serialVersionUID = 640474123189874263L; + + /** + * 项目id + */ + private Long projectId; + + /** + * 分包方id + */ + private Long contractorId; + + /** + * 物料名称 + */ + private String materialName; + + /** + * 物料类型 + */ + private String materialType; + + /** + * 物料型号 + */ + private String materialModel; + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractormaterial/SubContractorMaterialUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractormaterial/SubContractorMaterialUpdateReq.java new file mode 100644 index 00000000..36b96639 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractormaterial/SubContractorMaterialUpdateReq.java @@ -0,0 +1,63 @@ +package org.dromara.contractor.domain.dto.contractormaterial; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author lcj + * @date 2025/6/27 14:20 + */ +@Data +public class SubContractorMaterialUpdateReq implements Serializable { + + @Serial + private static final long serialVersionUID = -4488270790673814590L; + + /** + * 主键id + */ + private Long id; + + /** + * 项目id + */ + private Long projectId; + + /** + * 分包方id + */ + private Long contractorId; + + /** + * 物料名称 + */ + private String materialName; + + /** + * 物料类型 + */ + private String materialType; + + /** + * 物料型号 + */ + private String materialModel; + + /** + * 物料单位 + */ + private String materialUnit; + + /** + * 文件 + */ + private String file; + + /** + * 备注 + */ + private String remark; + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractormaterialrecord/SubContractorMaterialRecordCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractormaterialrecord/SubContractorMaterialRecordCreateReq.java new file mode 100644 index 00000000..4e6f227a --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractormaterialrecord/SubContractorMaterialRecordCreateReq.java @@ -0,0 +1,57 @@ +package org.dromara.contractor.domain.dto.contractormaterialrecord; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * @author lcj + * @date 2025/6/27 14:35 + */ +@Data +public class SubContractorMaterialRecordCreateReq implements Serializable { + + @Serial + private static final long serialVersionUID = -2325294573057427849L; + + /** + * 物料id + */ + private Long contractorMaterialId; + + /** + * 记录类型(1到货计划 2使用情况) + */ + private String recordType; + + /** + * 记录时间 + */ + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + private Date recordTime; + + /** + * 数量 + */ + private BigDecimal recordNumber; + + /** + * 使用位置或构件部位(使用情况) + */ + private String usedPosition; + + /** + * 相关附件 + */ + private String file; + + /** + * 备注 + */ + private String remark; + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractormaterialrecord/SubContractorMaterialRecordQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractormaterialrecord/SubContractorMaterialRecordQueryReq.java new file mode 100644 index 00000000..ab3eb963 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractormaterialrecord/SubContractorMaterialRecordQueryReq.java @@ -0,0 +1,43 @@ +package org.dromara.contractor.domain.dto.contractormaterialrecord; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author lcj + * @date 2025/6/27 14:36 + */ +@Data +public class SubContractorMaterialRecordQueryReq implements Serializable { + + @Serial + private static final long serialVersionUID = -5817912360176038347L; + + /** + * 项目id + */ + private Long projectId; + + /** + * 分包方id + */ + private Long contractorId; + + /** + * 物料id + */ + private Long contractorMaterialId; + + /** + * 记录类型(1到货计划 2使用情况) + */ + private String recordType; + + /** + * 使用位置或构件部位(使用情况) + */ + private String usedPosition; + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractormaterialrecord/SubContractorMaterialRecordUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractormaterialrecord/SubContractorMaterialRecordUpdateReq.java new file mode 100644 index 00000000..f9b389e7 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractormaterialrecord/SubContractorMaterialRecordUpdateReq.java @@ -0,0 +1,62 @@ +package org.dromara.contractor.domain.dto.contractormaterialrecord; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * @author lcj + * @date 2025/6/27 14:36 + */ +@Data +public class SubContractorMaterialRecordUpdateReq implements Serializable { + + @Serial + private static final long serialVersionUID = -6087029523445301396L; + + /** + * 主键id + */ + private Long id; + + /** + * 物料id + */ + private Long contractorMaterialId; + + /** + * 记录类型(1到货计划 2使用情况) + */ + private String recordType; + + /** + * 记录时间 + */ + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + private Date recordTime; + + /** + * 数量 + */ + private BigDecimal recordNumber; + + /** + * 使用位置或构件部位(使用情况) + */ + private String usedPosition; + + /** + * 相关附件 + */ + private String file; + + /** + * 备注 + */ + private String remark; + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractortool/BusContractorToolCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractortool/SubContractorToolCreateReq.java similarity index 78% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractortool/BusContractorToolCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractortool/SubContractorToolCreateReq.java index 90f633c2..6fed1173 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractortool/BusContractorToolCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractortool/SubContractorToolCreateReq.java @@ -1,16 +1,17 @@ -package org.dromara.project.domain.dto.contractortool; +package org.dromara.contractor.domain.dto.contractortool; import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; /** * @author lcj * @date 2025/6/26 15:26 */ @Data -public class BusContractorToolCreateReq implements Serializable { +public class SubContractorToolCreateReq implements Serializable { @Serial private static final long serialVersionUID = -148571725751082526L; @@ -43,7 +44,7 @@ public class BusContractorToolCreateReq implements Serializable { /** * 工具数量 */ - private String toolNumber; + private BigDecimal toolNumber; /** * 文件 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractortool/BusContractorToolQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractortool/SubContractorToolQueryReq.java similarity index 81% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractortool/BusContractorToolQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractortool/SubContractorToolQueryReq.java index 2f23ca66..5a4cb27a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractortool/BusContractorToolQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractortool/SubContractorToolQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.dto.contractortool; +package org.dromara.contractor.domain.dto.contractortool; import lombok.Data; @@ -10,7 +10,7 @@ import java.io.Serializable; * @date 2025/6/26 15:26 */ @Data -public class BusContractorToolQueryReq implements Serializable { +public class SubContractorToolQueryReq implements Serializable { @Serial private static final long serialVersionUID = -654101391027815665L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractortool/BusContractorToolUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractortool/SubContractorToolUpdateReq.java similarity index 80% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractortool/BusContractorToolUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractortool/SubContractorToolUpdateReq.java index df12a876..c7cb1526 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractortool/BusContractorToolUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractortool/SubContractorToolUpdateReq.java @@ -1,16 +1,17 @@ -package org.dromara.project.domain.dto.contractortool; +package org.dromara.contractor.domain.dto.contractortool; import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; /** * @author lcj * @date 2025/6/26 15:26 */ @Data -public class BusContractorToolUpdateReq implements Serializable { +public class SubContractorToolUpdateReq implements Serializable { @Serial private static final long serialVersionUID = 6147452720586538283L; @@ -48,7 +49,7 @@ public class BusContractorToolUpdateReq implements Serializable { /** * 工具数量 */ - private String toolNumber; + private BigDecimal toolNumber; /** * 文件 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractortoolentry/SubContractorToolRecordCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractortoolentry/SubContractorToolRecordCreateReq.java index 6dd42874..f5ade2ed 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractortoolentry/SubContractorToolRecordCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractortoolentry/SubContractorToolRecordCreateReq.java @@ -1,9 +1,11 @@ package org.dromara.contractor.domain.dto.contractortoolentry; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -27,9 +29,9 @@ public class SubContractorToolRecordCreateReq implements Serializable { private String recordType; /** - * 进场工器具数量 + * 记录工器具数量 */ - private String toolNumber; + private BigDecimal recordNumber; /** * 检测编号 @@ -44,6 +46,7 @@ public class SubContractorToolRecordCreateReq implements Serializable { /** * 检测时间 */ + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") private Date checkTime; /** @@ -57,7 +60,8 @@ public class SubContractorToolRecordCreateReq implements Serializable { private String remark; /** - * 进场时间 + * 记录时间 */ - private Date entryTime; + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + private Date recordTime; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractortoolentry/SubContractorToolRecordQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractortoolentry/SubContractorToolRecordQueryReq.java index d6fb911a..c95741e7 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractortoolentry/SubContractorToolRecordQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractortoolentry/SubContractorToolRecordQueryReq.java @@ -40,4 +40,9 @@ public class SubContractorToolRecordQueryReq implements Serializable { */ private String checkDept; + /** + * 记录类型 + */ + private String recordType; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractortoolentry/SubContractorToolRecordUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractortoolentry/SubContractorToolRecordUpdateReq.java index 96a5fa17..9e508913 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractortoolentry/SubContractorToolRecordUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/contractortoolentry/SubContractorToolRecordUpdateReq.java @@ -1,9 +1,11 @@ package org.dromara.contractor.domain.dto.contractortoolentry; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -22,9 +24,9 @@ public class SubContractorToolRecordUpdateReq implements Serializable { private Long id; /** - * 进场工器具数量 + * 记录工器具数量 */ - private String toolNumber; + private BigDecimal recordNumber; /** * 检测编号 @@ -39,6 +41,7 @@ public class SubContractorToolRecordUpdateReq implements Serializable { /** * 检测时间 */ + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") private Date checkTime; /** @@ -52,8 +55,9 @@ public class SubContractorToolRecordUpdateReq implements Serializable { private String remark; /** - * 进场时间 + * 记录时间 */ - private Date entryTime; + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + private Date recordTime; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/subcontract/BusSubcontractCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/subcontract/SubSubcontractCreateReq.java similarity index 88% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/subcontract/BusSubcontractCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/subcontract/SubSubcontractCreateReq.java index 6e7e41e0..926d41e3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/subcontract/BusSubcontractCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/subcontract/SubSubcontractCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.dto.subcontract; +package org.dromara.contractor.domain.dto.subcontract; import lombok.Data; @@ -12,7 +12,7 @@ import java.util.Date; * @date 2025/6/25 16:36 */ @Data -public class BusSubcontractCreateReq implements Serializable { +public class SubSubcontractCreateReq implements Serializable { @Serial private static final long serialVersionUID = -3386090526440868496L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/subcontract/BusSubcontractQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/subcontract/SubSubcontractQueryReq.java similarity index 82% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/subcontract/BusSubcontractQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/subcontract/SubSubcontractQueryReq.java index b3ba1ccb..ddc5d340 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/subcontract/BusSubcontractQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/subcontract/SubSubcontractQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.dto.subcontract; +package org.dromara.contractor.domain.dto.subcontract; import lombok.Data; @@ -10,7 +10,7 @@ import java.io.Serializable; * @date 2025/6/25 16:37 */ @Data -public class BusSubcontractQueryReq implements Serializable { +public class SubSubcontractQueryReq implements Serializable { @Serial private static final long serialVersionUID = 3731492397283570840L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/subcontract/BusSubcontractUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/subcontract/SubSubcontractUpdateReq.java similarity index 88% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/subcontract/BusSubcontractUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/subcontract/SubSubcontractUpdateReq.java index 05e73239..fd989776 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/subcontract/BusSubcontractUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/subcontract/SubSubcontractUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.dto.subcontract; +package org.dromara.contractor.domain.dto.subcontract; import lombok.Data; @@ -12,7 +12,7 @@ import java.util.Date; * @date 2025/6/25 16:37 */ @Data -public class BusSubcontractUpdateReq implements Serializable { +public class SubSubcontractUpdateReq implements Serializable { @Serial private static final long serialVersionUID = -5617446079713109912L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusConstructionUserFileStatusEnum.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/enums/SubConstructionUserFileStatusEnum.java similarity index 66% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusConstructionUserFileStatusEnum.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/enums/SubConstructionUserFileStatusEnum.java index 21de91cb..05d4bdfd 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusConstructionUserFileStatusEnum.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/enums/SubConstructionUserFileStatusEnum.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.enums; +package org.dromara.contractor.domain.enums; import lombok.Getter; @@ -7,7 +7,7 @@ import lombok.Getter; * @date 2025/4/3 17:47 */ @Getter -public enum BusConstructionUserFileStatusEnum { +public enum SubConstructionUserFileStatusEnum { NOUPLOAD("未上传", "1"), PARTUPLOAD("部分上传", "2"), @@ -17,7 +17,7 @@ public enum BusConstructionUserFileStatusEnum { private final String value; - BusConstructionUserFileStatusEnum(String text, String value) { + SubConstructionUserFileStatusEnum(String text, String value) { this.text = text; this.value = value; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/enums/SubContractorRecordEnum.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/enums/SubContractorRecordEnum.java new file mode 100644 index 00000000..9b78d295 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/enums/SubContractorRecordEnum.java @@ -0,0 +1,23 @@ +package org.dromara.contractor.domain.enums; + +import lombok.Getter; + +/** + * @author lcj + * @date 2025/6/27 10:30 + */ +@Getter +public enum SubContractorRecordEnum { + + PUT("进场/入库", "1"), + OUT("出场/出库", "2"); + + private final String text; + + private final String value; + + SubContractorRecordEnum(String text, String value) { + this.text = text; + this.value = value; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/exportvo/BusConstructionUserExportVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/exportvo/BusConstructionUserExportVo.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/exportvo/BusConstructionUserExportVo.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/exportvo/BusConstructionUserExportVo.java index a2bf63a9..ed8b6ccf 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/exportvo/BusConstructionUserExportVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/exportvo/BusConstructionUserExportVo.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.exportvo; +package org.dromara.contractor.domain.exportvo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -6,7 +6,7 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.project.domain.BusConstructionUser; +import org.dromara.contractor.domain.SubConstructionUser; import java.io.Serial; import java.io.Serializable; @@ -18,7 +18,7 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = BusConstructionUser.class) +@AutoMapper(target = SubConstructionUser.class) public class BusConstructionUserExportVo implements Serializable { @Serial diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserAttendanceByDay.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserAttendanceByDay.java similarity index 85% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserAttendanceByDay.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserAttendanceByDay.java index bdbcda66..5cf0490e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserAttendanceByDay.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserAttendanceByDay.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.vo.constructionuser; +package org.dromara.contractor.domain.vo.constructionuser; import lombok.AllArgsConstructor; import lombok.Data; @@ -16,7 +16,7 @@ import java.util.List; @Data @AllArgsConstructor @NoArgsConstructor -public class BusConstructionUserAttendanceByDay { +public class SubConstructionUserAttendanceByDay { /** * 上班打卡时间 @@ -47,11 +47,11 @@ public class BusConstructionUserAttendanceByDay { */ private Date downClockTime; - public static BusConstructionUserAttendanceByDay build(List attendanceList) { + public static SubConstructionUserAttendanceByDay build(List attendanceList) { if (attendanceList == null) { return null; } - BusConstructionUserAttendanceByDay constructionUserAttendanceByDay = new BusConstructionUserAttendanceByDay(); + SubConstructionUserAttendanceByDay constructionUserAttendanceByDay = new SubConstructionUserAttendanceByDay(); for (BusAttendance attendance : attendanceList) { if (attendance.getCommuter().equals(BusAttendanceCommuterEnum.CLOCKIN.getValue())) { constructionUserAttendanceByDay.setUpClockTime(attendance.getClockTime()); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserAttendanceMonthVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserAttendanceMonthVo.java similarity index 78% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserAttendanceMonthVo.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserAttendanceMonthVo.java index 37ff7dc0..bf7d5dc0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserAttendanceMonthVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserAttendanceMonthVo.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.vo.constructionuser; +package org.dromara.contractor.domain.vo.constructionuser; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -12,7 +12,7 @@ import java.util.Date; * @date 2025/4/7 15:06 */ @Data -public class BusConstructionUserAttendanceMonthVo implements Serializable { +public class SubConstructionUserAttendanceMonthVo implements Serializable { @Serial private static final long serialVersionUID = -413447291128760025L; @@ -38,6 +38,6 @@ public class BusConstructionUserAttendanceMonthVo implements Serializable { /** * 当天打卡记录 */ - private BusConstructionUserAttendanceByDay clockList; + private SubConstructionUserAttendanceByDay clockList; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserAttendanceTotalVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserAttendanceTotalVo.java similarity index 87% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserAttendanceTotalVo.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserAttendanceTotalVo.java index 416cf386..fc34335c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserAttendanceTotalVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserAttendanceTotalVo.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.vo.constructionuser; +package org.dromara.contractor.domain.vo.constructionuser; import lombok.Data; @@ -11,7 +11,7 @@ import java.io.Serializable; * @date 2025/4/7 10:16 */ @Data -public class BusConstructionUserAttendanceTotalVo implements Serializable { +public class SubConstructionUserAttendanceTotalVo implements Serializable { @Serial private static final long serialVersionUID = 1335094839733429171L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserGisVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserGisVo.java similarity index 77% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserGisVo.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserGisVo.java index 016fc6d1..f448aef4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserGisVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserGisVo.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.vo.constructionuser; +package org.dromara.contractor.domain.vo.constructionuser; import lombok.Data; @@ -10,7 +10,7 @@ import java.io.Serializable; * @date 2025/4/28 9:33 */ @Data -public class BusConstructionUserGisVo implements Serializable { +public class SubConstructionUserGisVo implements Serializable { @Serial private static final long serialVersionUID = -3496633845665259321L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserVo.java similarity index 93% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserVo.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserVo.java index 2a196596..ed7c57f5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserVo.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.vo.constructionuser; +package org.dromara.contractor.domain.vo.constructionuser; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -6,8 +6,8 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.project.domain.BusConstructionUser; -import org.dromara.project.domain.vo.contractor.BusContractorVo; +import org.dromara.contractor.domain.SubConstructionUser; +import org.dromara.contractor.domain.vo.contractor.SubContractorVo; import java.io.Serial; import java.io.Serializable; @@ -22,8 +22,8 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = BusConstructionUser.class) -public class BusConstructionUserVo implements Serializable { +@AutoMapper(target = SubConstructionUser.class) +public class SubConstructionUserVo implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -67,7 +67,7 @@ public class BusConstructionUserVo implements Serializable { /** * 分包公司 */ - private BusContractorVo contractorVo; + private SubContractorVo contractorVo; /** * 班组id diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuserfile/BusConstructionUserFileVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuserfile/SubConstructionUserFileVo.java similarity index 82% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuserfile/BusConstructionUserFileVo.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuserfile/SubConstructionUserFileVo.java index ab68b3d0..f09f9fe0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuserfile/BusConstructionUserFileVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuserfile/SubConstructionUserFileVo.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.vo.constructionuserfile; +package org.dromara.contractor.domain.vo.constructionuserfile; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -6,7 +6,7 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.project.domain.BusConstructionUserFile; +import org.dromara.contractor.domain.SubConstructionUserFile; import java.io.Serial; import java.io.Serializable; @@ -20,8 +20,8 @@ import java.io.Serializable; */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = BusConstructionUserFile.class) -public class BusConstructionUserFileVo implements Serializable { +@AutoMapper(target = SubConstructionUserFile.class) +public class SubConstructionUserFileVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/contractor/BusContractorVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/contractor/SubContractorVo.java similarity index 86% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/contractor/BusContractorVo.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/contractor/SubContractorVo.java index c3a66cfd..7981aa07 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/contractor/BusContractorVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/contractor/SubContractorVo.java @@ -1,10 +1,10 @@ -package org.dromara.project.domain.vo.contractor; +package org.dromara.contractor.domain.vo.contractor; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.project.domain.BusContractor; +import org.dromara.contractor.domain.SubContractor; import java.io.Serial; import java.io.Serializable; @@ -13,15 +13,15 @@ import java.util.Map; /** - * 分包单位视图对象 bus_contractor + * 分包单位视图对象 sub_contractor * * @author lcj * @date 2025-03-07 */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = BusContractor.class) -public class BusContractorVo implements Serializable { +@AutoMapper(target = SubContractor.class) +public class SubContractorVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/contractormaterial/SubContractorMaterialVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/contractormaterial/SubContractorMaterialVo.java new file mode 100644 index 00000000..ea97c6f6 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/contractormaterial/SubContractorMaterialVo.java @@ -0,0 +1,97 @@ +package org.dromara.contractor.domain.vo.contractormaterial; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableId; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.contractor.domain.SubContractorMaterial; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + +/** + * 分包方物料视图对象 sub_contractor_material + * + * @author lcj + * @date 2025-06-27 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SubContractorMaterial.class) +public class SubContractorMaterialVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ExcelProperty(value = "主键id") + private Long id; + + /** + * 项目id + */ + @ExcelProperty(value = "项目id") + private Long projectId; + + /** + * 分包方id + */ + @ExcelProperty(value = "分包方id") + private Long contractorId; + + /** + * 分包方名称 + */ + private String contractorName; + + /** + * 物料名称 + */ + @ExcelProperty(value = "物料名称") + private String materialName; + + /** + * 物料类型 + */ + @ExcelProperty(value = "物料类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "contractor_material_type") + private String materialType; + + /** + * 物料型号 + */ + @ExcelProperty(value = "物料型号") + private String materialModel; + + /** + * 物料数量 + */ + @ExcelProperty(value = "物料数量") + private BigDecimal materialNumber; + + /** + * 物料单位 + */ + @ExcelProperty(value = "物料单位") + private String materialUnit; + + /** + * 文件 + */ + @ExcelProperty(value = "文件") + private String file; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/contractormaterialrecord/SubContractorMaterialRecordVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/contractormaterialrecord/SubContractorMaterialRecordVo.java new file mode 100644 index 00000000..872f6de1 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/contractormaterialrecord/SubContractorMaterialRecordVo.java @@ -0,0 +1,109 @@ +package org.dromara.contractor.domain.vo.contractormaterialrecord; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.contractor.domain.SubContractorMaterialRecord; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + + +/** + * 分包方物料记录视图对象 sub_contractor_material_record + * + * @author lcj + * @date 2025-06-27 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SubContractorMaterialRecord.class) +public class SubContractorMaterialRecordVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ExcelProperty(value = "主键id") + private Long id; + + /** + * 项目id + */ + @ExcelProperty(value = "项目id") + private Long projectId; + + /** + * 分包方id + */ + @ExcelProperty(value = "分包方id") + private Long contractorId; + + /** + * 分包方名称 + */ + private String contractorName; + + /** + * 物料id + */ + @ExcelProperty(value = "物料id") + private Long contractorMaterialId; + + /** + * 物料名称 + */ + private String contractorMaterialName; + + /** + * 记录类型(1到货计划 2使用情况) + */ + @ExcelProperty(value = "记录类型(1到货计划 2使用情况)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "contractor_material_record_type") + private String recordType; + + /** + * 记录时间 + */ + @ExcelProperty(value = "记录时间") + private Date recordTime; + + /** + * 数量 + */ + @ExcelProperty(value = "数量") + private BigDecimal recordNumber; + + /** + * 剩余数量(到货 使用) + */ + @ExcelProperty(value = "剩余数量(到货 使用)") + private BigDecimal remainingNumber; + + /** + * 使用位置或构件部位(使用情况) + */ + @ExcelProperty(value = "使用位置或构件部位(使用情况)") + private String usedPosition; + + /** + * 相关附件 + */ + @ExcelProperty(value = "相关附件") + private String file; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/contractortool/BusContractorToolVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/contractortool/SubContractorToolVo.java similarity index 82% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/contractortool/BusContractorToolVo.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/contractortool/SubContractorToolVo.java index 28ec3f6e..6c498718 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/contractortool/BusContractorToolVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/contractortool/SubContractorToolVo.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.vo.contractortool; +package org.dromara.contractor.domain.vo.contractortool; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -6,23 +6,24 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.project.domain.BusContractorTool; +import org.dromara.contractor.domain.SubContractorTool; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** - * 分包方工器具视图对象 bus_contractor_tool + * 分包方工器具视图对象 sub_contractor_tool * * @author lcj * @date 2025-06-26 */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = BusContractorTool.class) -public class BusContractorToolVo implements Serializable { +@AutoMapper(target = SubContractorTool.class) +public class SubContractorToolVo implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -73,7 +74,7 @@ public class BusContractorToolVo implements Serializable { * 工具数量 */ @ExcelProperty(value = "工具数量") - private String toolNumber; + private BigDecimal toolNumber; /** * 备注 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/contractortoolentry/SubContractorToolRecordVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/contractortoolentry/SubContractorToolRecordVo.java index 43bc414b..36c9cfd9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/contractortoolentry/SubContractorToolRecordVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/contractortoolentry/SubContractorToolRecordVo.java @@ -2,12 +2,14 @@ package org.dromara.contractor.domain.vo.contractortoolentry; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.contractor.domain.SubContractorToolRecord; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; @@ -66,10 +68,16 @@ public class SubContractorToolRecordVo implements Serializable { private String recordType; /** - * 进场工器具数量 + * 记录工器具数量 */ - @ExcelProperty(value = "进场工器具数量") - private String toolNumber; + @ExcelProperty(value = "记录工器具数量") + private BigDecimal recordNumber; + + /** + * 剩余数量 + */ + @ExcelProperty(value = "剩余数量") + private BigDecimal remainingNumber; /** * 检测编号 @@ -87,6 +95,7 @@ public class SubContractorToolRecordVo implements Serializable { * 检测时间 */ @ExcelProperty(value = "检测时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date checkTime; /** @@ -102,9 +111,10 @@ public class SubContractorToolRecordVo implements Serializable { private String remark; /** - * 进场时间 + * 记录时间 */ - @ExcelProperty(value = "进场时间") - private Date entryTime; + @ExcelProperty(value = "记录时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date recordTime; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/subcontract/BusSubcontractVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/subcontract/SubSubcontractVo.java similarity index 80% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/subcontract/BusSubcontractVo.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/subcontract/SubSubcontractVo.java index 9c8989bf..47070f0a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/subcontract/BusSubcontractVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/subcontract/SubSubcontractVo.java @@ -1,8 +1,8 @@ -package org.dromara.project.domain.vo.subcontract; +package org.dromara.contractor.domain.vo.subcontract; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.project.domain.BusSubcontract; +import org.dromara.contractor.domain.SubSubcontract; import java.io.Serial; import java.io.Serializable; @@ -11,14 +11,14 @@ import java.util.Date; /** - * 分包合同视图对象 bus_subcontract + * 分包合同视图对象 sub_subcontract * * @author lcj * @date 2025-06-25 */ @Data -@AutoMapper(target = BusSubcontract.class) -public class BusSubcontractVo implements Serializable { +@AutoMapper(target = SubSubcontract.class) +public class SubSubcontractVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubConstructionUserFileMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubConstructionUserFileMapper.java new file mode 100644 index 00000000..0ff2beda --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubConstructionUserFileMapper.java @@ -0,0 +1,15 @@ +package org.dromara.contractor.mapper; + +import org.dromara.contractor.domain.SubConstructionUserFile; +import org.dromara.contractor.domain.vo.constructionuserfile.SubConstructionUserFileVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 施工人员文件存储Mapper接口 + * + * @author lcj + * @date 2025-04-01 + */ +public interface SubConstructionUserFileMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubConstructionUserMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubConstructionUserMapper.java new file mode 100644 index 00000000..829f51bd --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubConstructionUserMapper.java @@ -0,0 +1,15 @@ +package org.dromara.contractor.mapper; + +import org.dromara.contractor.domain.SubConstructionUser; +import org.dromara.contractor.domain.vo.constructionuser.SubConstructionUserVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 施工人员Mapper接口 + * + * @author lcj + * @date 2025-03-07 + */ +public interface SubConstructionUserMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubContractorMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubContractorMapper.java new file mode 100644 index 00000000..97d58211 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubContractorMapper.java @@ -0,0 +1,15 @@ +package org.dromara.contractor.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.contractor.domain.SubContractor; +import org.dromara.contractor.domain.vo.contractor.SubContractorVo; + +/** + * 分包单位Mapper接口 + * + * @author lcj + * @date 2025-03-07 + */ +public interface SubContractorMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubContractorMaterialMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubContractorMaterialMapper.java new file mode 100644 index 00000000..198189f6 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubContractorMaterialMapper.java @@ -0,0 +1,15 @@ +package org.dromara.contractor.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.contractor.domain.SubContractorMaterial; +import org.dromara.contractor.domain.vo.contractormaterial.SubContractorMaterialVo; + +/** + * 分包方物料Mapper接口 + * + * @author lcj + * @date 2025-06-27 + */ +public interface SubContractorMaterialMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubContractorMaterialRecordMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubContractorMaterialRecordMapper.java new file mode 100644 index 00000000..cee0725e --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubContractorMaterialRecordMapper.java @@ -0,0 +1,15 @@ +package org.dromara.contractor.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.contractor.domain.SubContractorMaterialRecord; +import org.dromara.contractor.domain.vo.contractormaterialrecord.SubContractorMaterialRecordVo; + +/** + * 分包方物料记录Mapper接口 + * + * @author lcj + * @date 2025-06-27 + */ +public interface SubContractorMaterialRecordMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubContractorToolMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubContractorToolMapper.java new file mode 100644 index 00000000..e0b83404 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubContractorToolMapper.java @@ -0,0 +1,15 @@ +package org.dromara.contractor.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.contractor.domain.SubContractorTool; +import org.dromara.contractor.domain.vo.contractortool.SubContractorToolVo; + +/** + * 分包方工器具Mapper接口 + * + * @author lcj + * @date 2025-06-26 + */ +public interface SubContractorToolMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubSubcontractMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubSubcontractMapper.java new file mode 100644 index 00000000..50b397b2 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/mapper/SubSubcontractMapper.java @@ -0,0 +1,15 @@ +package org.dromara.contractor.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.contractor.domain.SubSubcontract; +import org.dromara.contractor.domain.vo.subcontract.SubSubcontractVo; + +/** + * 分包合同Mapper接口 + * + * @author lcj + * @date 2025-06-25 + */ +public interface SubSubcontractMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserFileService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubConstructionUserFileService.java similarity index 57% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserFileService.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubConstructionUserFileService.java index 490675e3..c1dcafaa 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserFileService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubConstructionUserFileService.java @@ -1,14 +1,14 @@ -package org.dromara.project.service; +package org.dromara.contractor.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.servlet.http.HttpServletResponse; -import org.dromara.project.domain.BusConstructionUser; -import org.dromara.project.domain.BusConstructionUserFile; -import org.dromara.project.domain.dto.constructionuserfile.BusConstructionUserFileQueryReq; -import org.dromara.project.domain.dto.constructionuserfile.BusConstructionUserFileSaveReq; -import org.dromara.project.domain.dto.constructionuserfile.BusConstructionUserFileTemplateReq; -import org.dromara.project.domain.vo.constructionuserfile.BusConstructionUserFileVo; +import org.dromara.contractor.domain.SubConstructionUser; +import org.dromara.contractor.domain.SubConstructionUserFile; +import org.dromara.contractor.domain.dto.constructionuserfile.SubConstructionUserFileQueryReq; +import org.dromara.contractor.domain.dto.constructionuserfile.SubConstructionUserFileSaveReq; +import org.dromara.contractor.domain.dto.constructionuserfile.SubConstructionUserFileTemplateReq; +import org.dromara.contractor.domain.vo.constructionuserfile.SubConstructionUserFileVo; import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -19,7 +19,7 @@ import java.util.List; * @author lcj * @date 2025-04-01 */ -public interface IBusConstructionUserFileService extends IService { +public interface ISubConstructionUserFileService extends IService { /** * 查询施工人员文件存储 @@ -27,7 +27,7 @@ public interface IBusConstructionUserFileService extends IService queryList(BusConstructionUserFileQueryReq req); + List queryList(SubConstructionUserFileQueryReq req); /** * 导出施工人员文件模版zip @@ -43,7 +43,7 @@ public interface IBusConstructionUserFileService extends IService buildQueryWrapper(BusConstructionUserFileQueryReq req); + LambdaQueryWrapper buildQueryWrapper(SubConstructionUserFileQueryReq req); /** * 获取施工人员查询条件封装 @@ -75,6 +75,6 @@ public interface IBusConstructionUserFileService extends IService buildTemplateQueryWrapper(BusConstructionUserFileTemplateReq req); + LambdaQueryWrapper buildTemplateQueryWrapper(SubConstructionUserFileTemplateReq req); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubConstructionUserService.java similarity index 64% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserService.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubConstructionUserService.java index eaf8535e..9a0ad0aa 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubConstructionUserService.java @@ -1,17 +1,17 @@ -package org.dromara.project.service; +package org.dromara.contractor.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.project.domain.BusConstructionUser; -import org.dromara.project.domain.exportvo.BusConstructionUserExportVo; -import org.dromara.project.domain.dto.constructionuser.*; -import org.dromara.project.domain.vo.constructionuser.BusConstructionUserAttendanceMonthVo; -import org.dromara.project.domain.vo.constructionuser.BusConstructionUserAttendanceTotalVo; -import org.dromara.project.domain.vo.constructionuser.BusConstructionUserGisVo; -import org.dromara.project.domain.vo.constructionuser.BusConstructionUserVo; +import org.dromara.contractor.domain.SubConstructionUser; +import org.dromara.contractor.domain.dto.constructionuser.*; +import org.dromara.contractor.domain.vo.constructionuser.SubConstructionUserVo; +import org.dromara.contractor.domain.exportvo.BusConstructionUserExportVo; +import org.dromara.contractor.domain.vo.constructionuser.SubConstructionUserAttendanceMonthVo; +import org.dromara.contractor.domain.vo.constructionuser.SubConstructionUserAttendanceTotalVo; +import org.dromara.contractor.domain.vo.constructionuser.SubConstructionUserGisVo; import java.util.Collection; import java.util.List; @@ -22,7 +22,7 @@ import java.util.List; * @author lcj * @date 2025-03-07 */ -public interface IBusConstructionUserService extends IService { +public interface ISubConstructionUserService extends IService { /** * 查询施工人员 @@ -30,7 +30,7 @@ public interface IBusConstructionUserService extends IService queryPageList(BusConstructionUserQueryReq req, PageQuery pageQuery); + TableDataInfo queryPageList(SubConstructionUserQueryReq req, PageQuery pageQuery); /** * 分页查询施工人员考勤列表 @@ -48,7 +48,7 @@ public interface IBusConstructionUserService extends IService queryPageAttendanceList(BusConstructionUserAttendanceQueryReq req, PageQuery pageQuery); + TableDataInfo queryPageAttendanceList(SubConstructionUserAttendanceQueryReq req, PageQuery pageQuery); /** * 查询施工人员月考勤列表 @@ -56,7 +56,7 @@ public interface IBusConstructionUserService extends IService queryAttendanceMonthList(BusConstructionUserAttendanceMonthReq req); + List queryAttendanceMonthList(SubConstructionUserAttendanceMonthReq req); /** * 查询符合条件的施工人员列表 @@ -64,7 +64,7 @@ public interface IBusConstructionUserService extends IService queryList(BusConstructionUserQueryReq req); + List queryList(SubConstructionUserQueryReq req); /** * 获取施工人员大屏数据 @@ -72,7 +72,7 @@ public interface IBusConstructionUserService extends IService buildQueryWrapper(BusConstructionUserQueryReq req); + LambdaQueryWrapper buildQueryWrapper(SubConstructionUserQueryReq req); /** * 获取施工人员分页对象视图 @@ -161,7 +161,7 @@ public interface IBusConstructionUserService extends IService getVoPage(Page constructionUserPage); + Page getVoPage(Page constructionUserPage); /** * 获取施工人员考勤分页对象视图 @@ -169,7 +169,7 @@ public interface IBusConstructionUserService extends IService getAttendanceTotalVoPage(BusConstructionUserAttendanceQueryReq req, + Page getAttendanceTotalVoPage(SubConstructionUserAttendanceQueryReq req, PageQuery pageQuery); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubContractorMaterialRecordService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubContractorMaterialRecordService.java new file mode 100644 index 00000000..0f635cb2 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubContractorMaterialRecordService.java @@ -0,0 +1,98 @@ +package org.dromara.contractor.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.contractor.domain.SubContractorMaterialRecord; +import org.dromara.contractor.domain.dto.contractormaterialrecord.SubContractorMaterialRecordCreateReq; +import org.dromara.contractor.domain.dto.contractormaterialrecord.SubContractorMaterialRecordQueryReq; +import org.dromara.contractor.domain.dto.contractormaterialrecord.SubContractorMaterialRecordUpdateReq; +import org.dromara.contractor.domain.vo.contractormaterialrecord.SubContractorMaterialRecordVo; + +import java.util.Collection; +import java.util.List; + +/** + * 分包方物料记录Service接口 + * + * @author lcj + * @date 2025-06-27 + */ +public interface ISubContractorMaterialRecordService extends IService { + + /** + * 查询分包方物料记录 + * + * @param id 主键 + * @return 分包方物料记录 + */ + SubContractorMaterialRecordVo queryById(Long id); + + /** + * 分页查询分包方物料记录列表 + * + * @param req 查询条件 + * @param pageQuery 分页参数 + * @return 分包方物料记录分页列表 + */ + TableDataInfo queryPageList(SubContractorMaterialRecordQueryReq req, PageQuery pageQuery); + + /** + * 查询符合条件的分包方物料记录列表 + * + * @param req 查询条件 + * @return 分包方物料记录列表 + */ + List queryList(SubContractorMaterialRecordQueryReq req); + + /** + * 新增分包方物料记录 + * + * @param req 分包方物料记录 + * @return 新增分包方物料记录id + */ + Long insertByBo(SubContractorMaterialRecordCreateReq req); + + /** + * 修改分包方物料记录 + * + * @param req 分包方物料记录 + * @return 是否修改成功 + */ + Boolean updateByBo(SubContractorMaterialRecordUpdateReq req); + + /** + * 校验并批量删除分包方物料记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 获取分包方物料记录视图对象 + * + * @param contractorMaterialRecord 分包方物料记录对象 + * @return 分包方物料记录视图对象 + */ + SubContractorMaterialRecordVo getVo(SubContractorMaterialRecord contractorMaterialRecord); + + /** + * 获取分包方物料记录查询条件封装 + * + * @param req 分包方物料记录查询条件 + * @return 分包方物料记录查询条件封装 + */ + LambdaQueryWrapper buildQueryWrapper(SubContractorMaterialRecordQueryReq req); + + /** + * 获取分包方物料记录分页对象视图 + * + * @param contractorMaterialRecordPage 分包方物料记录分页对象 + * @return 分包方物料记录分页对象视图 + */ + Page getVoPage(Page contractorMaterialRecordPage); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubContractorMaterialService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubContractorMaterialService.java new file mode 100644 index 00000000..b9b95422 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubContractorMaterialService.java @@ -0,0 +1,98 @@ +package org.dromara.contractor.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.contractor.domain.SubContractorMaterial; +import org.dromara.contractor.domain.dto.contractormaterial.SubContractorMaterialCreateReq; +import org.dromara.contractor.domain.dto.contractormaterial.SubContractorMaterialQueryReq; +import org.dromara.contractor.domain.dto.contractormaterial.SubContractorMaterialUpdateReq; +import org.dromara.contractor.domain.vo.contractormaterial.SubContractorMaterialVo; + +import java.util.Collection; +import java.util.List; + +/** + * 分包方物料Service接口 + * + * @author lcj + * @date 2025-06-27 + */ +public interface ISubContractorMaterialService extends IService { + + /** + * 查询分包方物料 + * + * @param id 主键 + * @return 分包方物料 + */ + SubContractorMaterialVo queryById(Long id); + + /** + * 分页查询分包方物料列表 + * + * @param req 查询条件 + * @param pageQuery 分页参数 + * @return 分包方物料分页列表 + */ + TableDataInfo queryPageList(SubContractorMaterialQueryReq req, PageQuery pageQuery); + + /** + * 查询符合条件的分包方物料列表 + * + * @param req 查询条件 + * @return 分包方物料列表 + */ + List queryList(SubContractorMaterialQueryReq req); + + /** + * 新增分包方物料 + * + * @param req 分包方物料 + * @return 新增分包物料主键id + */ + Long insertByBo(SubContractorMaterialCreateReq req); + + /** + * 修改分包方物料 + * + * @param req 分包方物料 + * @return 是否修改成功 + */ + Boolean updateByBo(SubContractorMaterialUpdateReq req); + + /** + * 校验并批量删除分包方物料信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 获取分包方物料视图对象 + * + * @param contractorMaterial 分包方物料对象 + * @return 分包方物料视图对象 + */ + SubContractorMaterialVo getVo(SubContractorMaterial contractorMaterial); + + /** + * 获取分包方物料查询条件封装 + * + * @param req 分包方物料查询条件 + * @return 分包方物料查询条件封装 + */ + LambdaQueryWrapper buildQueryWrapper(SubContractorMaterialQueryReq req); + + /** + * 获取分包方物料分页对象视图 + * + * @param contractorMaterialPage 分包方物料分页对象 + * @return 分包方物料分页对象视图 + */ + Page getVoPage(Page contractorMaterialPage); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusContractorService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubContractorService.java similarity index 67% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusContractorService.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubContractorService.java index 768a798c..c2a2d876 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusContractorService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubContractorService.java @@ -1,15 +1,15 @@ -package org.dromara.project.service; +package org.dromara.contractor.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.project.domain.BusContractor; -import org.dromara.project.domain.dto.contractor.BusContractorCreateReq; -import org.dromara.project.domain.dto.contractor.BusContractorQueryReq; -import org.dromara.project.domain.dto.contractor.BusContractorUpdateReq; -import org.dromara.project.domain.vo.contractor.BusContractorVo; +import org.dromara.contractor.domain.SubContractor; +import org.dromara.contractor.domain.dto.contractor.SubContractorCreateReq; +import org.dromara.contractor.domain.dto.contractor.SubContractorQueryReq; +import org.dromara.contractor.domain.dto.contractor.SubContractorUpdateReq; +import org.dromara.contractor.domain.vo.contractor.SubContractorVo; import java.util.Collection; import java.util.List; @@ -20,7 +20,7 @@ import java.util.List; * @author lcj * @date 2025-03-07 */ -public interface IBusContractorService extends IService { +public interface ISubContractorService extends IService { /** * 查询分包单位 @@ -28,7 +28,7 @@ public interface IBusContractorService extends IService { * @param id 主键 * @return 分包单位 */ - BusContractorVo queryById(Long id); + SubContractorVo queryById(Long id); /** * 分页查询分包单位列表 @@ -37,7 +37,7 @@ public interface IBusContractorService extends IService { * @param pageQuery 分页参数 * @return 分包单位分页列表 */ - TableDataInfo queryPageList(BusContractorQueryReq req, PageQuery pageQuery); + TableDataInfo queryPageList(SubContractorQueryReq req, PageQuery pageQuery); /** * 查询符合条件的分包单位列表 @@ -45,7 +45,7 @@ public interface IBusContractorService extends IService { * @param req 查询条件 * @return 分包单位列表 */ - List queryList(BusContractorQueryReq req); + List queryList(SubContractorQueryReq req); /** * 新增分包单位 @@ -53,7 +53,7 @@ public interface IBusContractorService extends IService { * @param req 分包单位 * @return 新增id */ - Long insertByBo(BusContractorCreateReq req); + Long insertByBo(SubContractorCreateReq req); /** * 修改分包单位 @@ -61,7 +61,7 @@ public interface IBusContractorService extends IService { * @param req 分包单位 * @return 是否修改成功 */ - Boolean updateByBo(BusContractorUpdateReq req); + Boolean updateByBo(SubContractorUpdateReq req); /** * 校验并批量删除分包单位信息 @@ -78,7 +78,7 @@ public interface IBusContractorService extends IService { * @param contractor 分包公司对象 * @return 分包公司视图对象 */ - BusContractorVo getVo(BusContractor contractor); + SubContractorVo getVo(SubContractor contractor); /** * 获取分包公司查询条件封装 @@ -86,7 +86,7 @@ public interface IBusContractorService extends IService { * @param req 分包公司查询条件 * @return 分包公司查询条件封装 */ - LambdaQueryWrapper buildQueryWrapper(BusContractorQueryReq req); + LambdaQueryWrapper buildQueryWrapper(SubContractorQueryReq req); /** * 获取分包公司分页对象视图 @@ -94,6 +94,6 @@ public interface IBusContractorService extends IService { * @param contractorPage 分包公司分页对象 * @return 分包公司分页对象视图 */ - Page getVoPage(Page contractorPage); + Page getVoPage(Page contractorPage); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubContractorToolRecordService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubContractorToolRecordService.java index 4e30c6ef..73cfa588 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubContractorToolRecordService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubContractorToolRecordService.java @@ -75,10 +75,10 @@ public interface ISubContractorToolRecordService extends IService getVoPage(Page contractorToolEntryPage); + Page getVoPage(Page contractorToolRecordPage); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusContractorToolService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubContractorToolService.java similarity index 68% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusContractorToolService.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubContractorToolService.java index 59905ad9..f4c9616c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusContractorToolService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubContractorToolService.java @@ -1,15 +1,15 @@ -package org.dromara.project.service; +package org.dromara.contractor.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.project.domain.BusContractorTool; -import org.dromara.project.domain.dto.contractortool.BusContractorToolCreateReq; -import org.dromara.project.domain.dto.contractortool.BusContractorToolQueryReq; -import org.dromara.project.domain.dto.contractortool.BusContractorToolUpdateReq; -import org.dromara.project.domain.vo.contractortool.BusContractorToolVo; +import org.dromara.contractor.domain.SubContractorTool; +import org.dromara.contractor.domain.dto.contractortool.SubContractorToolCreateReq; +import org.dromara.contractor.domain.dto.contractortool.SubContractorToolQueryReq; +import org.dromara.contractor.domain.dto.contractortool.SubContractorToolUpdateReq; +import org.dromara.contractor.domain.vo.contractortool.SubContractorToolVo; import java.util.Collection; import java.util.List; @@ -20,7 +20,7 @@ import java.util.List; * @author lcj * @date 2025-06-26 */ -public interface IBusContractorToolService extends IService { +public interface ISubContractorToolService extends IService { /** * 查询分包方工器具 @@ -28,7 +28,7 @@ public interface IBusContractorToolService extends IService { * @param id 主键 * @return 分包方工器具 */ - BusContractorToolVo queryById(Long id); + SubContractorToolVo queryById(Long id); /** * 分页查询分包方工器具列表 @@ -37,7 +37,7 @@ public interface IBusContractorToolService extends IService { * @param pageQuery 分页参数 * @return 分包方工器具分页列表 */ - TableDataInfo queryPageList(BusContractorToolQueryReq req, PageQuery pageQuery); + TableDataInfo queryPageList(SubContractorToolQueryReq req, PageQuery pageQuery); /** * 查询符合条件的分包方工器具列表 @@ -45,7 +45,7 @@ public interface IBusContractorToolService extends IService { * @param req 查询条件 * @return 分包方工器具列表 */ - List queryList(BusContractorToolQueryReq req); + List queryList(SubContractorToolQueryReq req); /** * 新增分包方工器具 @@ -53,7 +53,7 @@ public interface IBusContractorToolService extends IService { * @param req 分包方工器具 * @return 新增分包工器具主键id */ - Long insertByBo(BusContractorToolCreateReq req); + Long insertByBo(SubContractorToolCreateReq req); /** * 修改分包方工器具 @@ -61,7 +61,7 @@ public interface IBusContractorToolService extends IService { * @param req 分包方工器具 * @return 是否修改成功 */ - Boolean updateByBo(BusContractorToolUpdateReq req); + Boolean updateByBo(SubContractorToolUpdateReq req); /** * 校验并批量删除分包方工器具信息 @@ -78,7 +78,7 @@ public interface IBusContractorToolService extends IService { * @param contractorTool 分包方工器具对象 * @return 分包方工器具视图对象 */ - BusContractorToolVo getVo(BusContractorTool contractorTool); + SubContractorToolVo getVo(SubContractorTool contractorTool); /** * 获取分包方工器具查询条件封装 @@ -86,7 +86,7 @@ public interface IBusContractorToolService extends IService { * @param req 分包方工器具查询条件 * @return 分包方工器具查询条件封装 */ - LambdaQueryWrapper buildQueryWrapper(BusContractorToolQueryReq req); + LambdaQueryWrapper buildQueryWrapper(SubContractorToolQueryReq req); /** * 获取分包方工器具分页对象视图 @@ -94,5 +94,5 @@ public interface IBusContractorToolService extends IService { * @param contractorPage 分包方工器具分页对象 * @return 分包方工器具分页对象视图 */ - Page getVoPage(Page contractorPage); + Page getVoPage(Page contractorPage); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusSubcontractService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubSubcontractService.java similarity index 67% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusSubcontractService.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubSubcontractService.java index bf36a380..86449cb6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusSubcontractService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubSubcontractService.java @@ -1,15 +1,15 @@ -package org.dromara.project.service; +package org.dromara.contractor.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.project.domain.BusSubcontract; -import org.dromara.project.domain.dto.subcontract.BusSubcontractCreateReq; -import org.dromara.project.domain.dto.subcontract.BusSubcontractQueryReq; -import org.dromara.project.domain.dto.subcontract.BusSubcontractUpdateReq; -import org.dromara.project.domain.vo.subcontract.BusSubcontractVo; +import org.dromara.contractor.domain.SubSubcontract; +import org.dromara.contractor.domain.dto.subcontract.SubSubcontractCreateReq; +import org.dromara.contractor.domain.dto.subcontract.SubSubcontractQueryReq; +import org.dromara.contractor.domain.dto.subcontract.SubSubcontractUpdateReq; +import org.dromara.contractor.domain.vo.subcontract.SubSubcontractVo; import java.util.Collection; import java.util.List; @@ -20,7 +20,7 @@ import java.util.List; * @author lcj * @date 2025-06-25 */ -public interface IBusSubcontractService extends IService { +public interface ISubSubcontractService extends IService { /** * 查询分包合同 @@ -28,7 +28,7 @@ public interface IBusSubcontractService extends IService { * @param id 主键 * @return 分包合同 */ - BusSubcontractVo queryById(Long id); + SubSubcontractVo queryById(Long id); /** * 分页查询分包合同列表 @@ -37,7 +37,7 @@ public interface IBusSubcontractService extends IService { * @param pageQuery 分页参数 * @return 分包合同分页列表 */ - TableDataInfo queryPageList(BusSubcontractQueryReq req, PageQuery pageQuery); + TableDataInfo queryPageList(SubSubcontractQueryReq req, PageQuery pageQuery); /** * 查询符合条件的分包合同列表 @@ -45,7 +45,7 @@ public interface IBusSubcontractService extends IService { * @param req 查询条件 * @return 分包合同列表 */ - List queryList(BusSubcontractQueryReq req); + List queryList(SubSubcontractQueryReq req); /** * 新增分包合同 @@ -53,7 +53,7 @@ public interface IBusSubcontractService extends IService { * @param req 分包合同 * @return 新增主键id */ - Long insertByBo(BusSubcontractCreateReq req); + Long insertByBo(SubSubcontractCreateReq req); /** * 修改分包合同 @@ -61,7 +61,7 @@ public interface IBusSubcontractService extends IService { * @param req 分包合同 * @return 是否修改成功 */ - Boolean updateByBo(BusSubcontractUpdateReq req); + Boolean updateByBo(SubSubcontractUpdateReq req); /** * 校验并批量删除分包合同信息 @@ -78,7 +78,7 @@ public interface IBusSubcontractService extends IService { * @param subcontract 分包合同 * @return 分包合同视图 */ - BusSubcontractVo getVo(BusSubcontract subcontract); + SubSubcontractVo getVo(SubSubcontract subcontract); /** * 获取用户和项目关联对象查询条件封装 @@ -86,7 +86,7 @@ public interface IBusSubcontractService extends IService { * @param req 查询条件 * @return 查询条件封装 */ - LambdaQueryWrapper buildQueryWrapper(BusSubcontractQueryReq req); + LambdaQueryWrapper buildQueryWrapper(SubSubcontractQueryReq req); /** * 获取分包合同分页视图 @@ -94,6 +94,6 @@ public interface IBusSubcontractService extends IService { * @param subcontractPage 分包合同分页 * @return 分包合同分页视图 */ - Page getVoPage(Page subcontractPage); + Page getVoPage(Page subcontractPage); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserFileServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserFileServiceImpl.java similarity index 81% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserFileServiceImpl.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserFileServiceImpl.java index 59511779..91c3540e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserFileServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserFileServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.project.service.impl; +package org.dromara.contractor.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.FileUtil; @@ -18,20 +18,20 @@ import org.dromara.common.core.utils.ObjectUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.file.FileUtils; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.project.constant.BusConstructionUserConstant; +import org.dromara.contractor.domain.SubConstructionUserFile; +import org.dromara.contractor.constant.SubConstructionUserConstant; import org.dromara.project.domain.BusConstructionBlacklist; -import org.dromara.project.domain.BusConstructionUser; -import org.dromara.project.domain.BusConstructionUserFile; +import org.dromara.contractor.domain.SubConstructionUser; import org.dromara.project.domain.BusProject; -import org.dromara.project.domain.dto.constructionuserfile.BusConstructionUserFileQueryReq; -import org.dromara.project.domain.dto.constructionuserfile.BusConstructionUserFileReq; -import org.dromara.project.domain.dto.constructionuserfile.BusConstructionUserFileSaveReq; -import org.dromara.project.domain.dto.constructionuserfile.BusConstructionUserFileTemplateReq; -import org.dromara.project.domain.vo.constructionuserfile.BusConstructionUserFileVo; -import org.dromara.project.mapper.BusConstructionUserFileMapper; +import org.dromara.contractor.domain.dto.constructionuserfile.SubConstructionUserFileQueryReq; +import org.dromara.contractor.domain.dto.constructionuserfile.SubConstructionUserFileReq; +import org.dromara.contractor.domain.dto.constructionuserfile.SubConstructionUserFileSaveReq; +import org.dromara.contractor.domain.dto.constructionuserfile.SubConstructionUserFileTemplateReq; +import org.dromara.contractor.domain.vo.constructionuserfile.SubConstructionUserFileVo; +import org.dromara.contractor.mapper.SubConstructionUserFileMapper; import org.dromara.project.service.IBusConstructionBlacklistService; -import org.dromara.project.service.IBusConstructionUserFileService; -import org.dromara.project.service.IBusConstructionUserService; +import org.dromara.contractor.service.ISubConstructionUserFileService; +import org.dromara.contractor.service.ISubConstructionUserService; import org.dromara.project.service.IBusProjectService; import org.dromara.system.domain.vo.SysDictDataVo; import org.dromara.system.domain.vo.SysOssVo; @@ -62,14 +62,14 @@ import java.util.zip.ZipOutputStream; */ @Slf4j @Service -public class BusConstructionUserFileServiceImpl extends ServiceImpl - implements IBusConstructionUserFileService { +public class SubConstructionUserFileServiceImpl extends ServiceImpl + implements ISubConstructionUserFileService { @Resource private IBusProjectService projectService; @Resource - private IBusConstructionUserService constructionUserService; + private ISubConstructionUserService constructionUserService; @Resource private ISysDictTypeService dictTypeService; @@ -87,7 +87,7 @@ public class BusConstructionUserFileServiceImpl extends ServiceImpl queryList(BusConstructionUserFileQueryReq req) { - LambdaQueryWrapper lqw = buildQueryWrapper(req); + public List queryList(SubConstructionUserFileQueryReq req) { + LambdaQueryWrapper lqw = buildQueryWrapper(req); return baseMapper.selectVoList(lqw); } @@ -110,7 +110,7 @@ public class BusConstructionUserFileServiceImpl extends ServiceImpl constructionUserList = constructionUserService.list(this.buildTemplateQueryWrapper(req)); + List constructionUserList = constructionUserService.list(this.buildTemplateQueryWrapper(req)); // 3. 根目录名称 String randomString = project.getId() + "_" + RandomUtil.randomString(8); String rootFolder = project.getShortName() + "_" + randomString + "/"; @@ -131,13 +131,13 @@ public class BusConstructionUserFileServiceImpl extends ServiceImpl dictDataList = dictTypeService.selectDictDataByType(BusConstructionUserConstant.USER_FILE_TYPE); + List dictDataList = dictTypeService.selectDictDataByType(SubConstructionUserConstant.USER_FILE_TYPE); for (SysDictDataVo dataVo : dictDataList) { String subFolderPath = personFolder + dataVo.getDictValue() + "_" + dataVo.getDictLabel() + "/"; zipOut.putNextEntry(new ZipEntry(subFolderPath)); @@ -183,7 +183,7 @@ public class BusConstructionUserFileServiceImpl extends ServiceImpl constructionUserFileList = new ArrayList<>(); + List constructionUserFileList = new ArrayList<>(); try { // 2. 创建临时文件 tempZipFile = File.createTempFile(tempZipFilePath, null); @@ -230,7 +230,7 @@ public class BusConstructionUserFileServiceImpl extends ServiceImpl userIdList = constructionUserFileList.stream().map(BusConstructionUserFile::getUserId).toList(); - List oldConstructionUserFileList = this.lambdaQuery() - .in(BusConstructionUserFile::getUserId, userIdList).list(); + List userIdList = constructionUserFileList.stream().map(SubConstructionUserFile::getUserId).toList(); + List oldConstructionUserFileList = this.lambdaQuery() + .in(SubConstructionUserFile::getUserId, userIdList).list(); // 10. 如果存在，则删除数据库对应记录和文件 if (CollUtil.isNotEmpty(oldConstructionUserFileList)) { // 待删除id - List deleteIds = oldConstructionUserFileList.stream().map(BusConstructionUserFile::getId).toList(); + List deleteIds = oldConstructionUserFileList.stream().map(SubConstructionUserFile::getId).toList(); // 待删除对象存储id List deleteOssIds = new ArrayList<>(); - for (BusConstructionUserFile constructionUserFile : oldConstructionUserFileList) { + for (SubConstructionUserFile constructionUserFile : oldConstructionUserFileList) { String path = constructionUserFile.getPath(); if (StrUtil.isNotBlank(path)) { String[] ossIds = path.split(","); @@ -307,16 +307,16 @@ public class BusConstructionUserFileServiceImpl extends ServiceImpl fileList = req.getFileList(); + List fileList = req.getFileList(); if (userId == null || CollUtil.isEmpty(fileList)) { throw new ServiceException("施工人员文件存储参数错误", HttpStatus.BAD_REQUEST); } // 校验修改用户是否存在 - BusConstructionUser constructionUser = constructionUserService.getById(userId); + SubConstructionUser constructionUser = constructionUserService.getById(userId); if (constructionUser == null) { throw new ServiceException("施工人员不存在", HttpStatus.NOT_FOUND); } @@ -325,22 +325,22 @@ public class BusConstructionUserFileServiceImpl extends ServiceImpl lqw = Wrappers.lambdaQuery(BusConstructionUserFile.class) - .eq(BusConstructionUserFile::getUserId, userId); - List constructionUserFileList = this.list(lqw); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(SubConstructionUserFile.class) + .eq(SubConstructionUserFile::getUserId, userId); + List constructionUserFileList = this.list(lqw); // 3. 构建 Map 方便查找 - Map existingFileMap = constructionUserFileList.stream() - .collect(Collectors.toMap(BusConstructionUserFile::getFileType, Function.identity())); + Map existingFileMap = constructionUserFileList.stream() + .collect(Collectors.toMap(SubConstructionUserFile::getFileType, Function.identity())); // 4. 处理新增或更新的数据 - List saveOrUpdateList = new ArrayList<>(); + List saveOrUpdateList = new ArrayList<>(); // 处理删除的数据 List deleteList = new ArrayList<>(); - for (BusConstructionUserFileReq fileReq : fileList) { + for (SubConstructionUserFileReq fileReq : fileList) { String fileType = fileReq.getFileType(); String fileId = fileReq.getFileId(); if (existingFileMap.containsKey(fileType)) { // 如果存在，则更新 - BusConstructionUserFile existingFile = existingFileMap.get(fileType); + SubConstructionUserFile existingFile = existingFileMap.get(fileType); // 如果文件id相同，则不更新 if (StringUtils.equals(existingFile.getPath(), fileId)) { continue; @@ -355,7 +355,7 @@ public class BusConstructionUserFileServiceImpl extends ServiceImpl buildQueryWrapper(BusConstructionUserFileQueryReq req) { - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + public LambdaQueryWrapper buildQueryWrapper(SubConstructionUserFileQueryReq req) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); if (req == null) { return lqw; } @@ -397,11 +397,11 @@ public class BusConstructionUserFileServiceImpl extends ServiceImpl buildTemplateQueryWrapper(BusConstructionUserFileTemplateReq req) { - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + public LambdaQueryWrapper buildTemplateQueryWrapper(SubConstructionUserFileTemplateReq req) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); if (req == null) { return lqw; } @@ -425,22 +425,22 @@ public class BusConstructionUserFileServiceImpl extends ServiceImpl userIdList = req.getUserIdList(); // 模糊查询 - lqw.like(StringUtils.isNotBlank(userName), BusConstructionUser::getUserName, userName); + lqw.like(StringUtils.isNotBlank(userName), SubConstructionUser::getUserName, userName); // 精确查询 - lqw.eq(ObjectUtils.isNotEmpty(projectId), BusConstructionUser::getProjectId, projectId); - lqw.eq(ObjectUtils.isNotEmpty(contractorId), BusConstructionUser::getContractorId, contractorId); - lqw.eq(ObjectUtils.isNotEmpty(teamId), BusConstructionUser::getTeamId, teamId); - lqw.eq(StringUtils.isNotBlank(typeOfWork), BusConstructionUser::getTypeOfWork, typeOfWork); - lqw.eq(StringUtils.isNotBlank(clock), BusConstructionUser::getClock, clock); + lqw.eq(ObjectUtils.isNotEmpty(projectId), SubConstructionUser::getProjectId, projectId); + lqw.eq(ObjectUtils.isNotEmpty(contractorId), SubConstructionUser::getContractorId, contractorId); + lqw.eq(ObjectUtils.isNotEmpty(teamId), SubConstructionUser::getTeamId, teamId); + lqw.eq(StringUtils.isNotBlank(typeOfWork), SubConstructionUser::getTypeOfWork, typeOfWork); + lqw.eq(StringUtils.isNotBlank(clock), SubConstructionUser::getClock, clock); if (CollUtil.isNotEmpty(userIdList)) { - lqw.in(BusConstructionUser::getId, userIdList); + lqw.in(SubConstructionUser::getId, userIdList); } // 根据项目id获取黑名单施工人员 List blacklistUserIdList = constructionBlacklistService.lambdaQuery() .eq(BusConstructionBlacklist::getProjectId, projectId) .list().stream().map(BusConstructionBlacklist::getUserId).toList(); if (CollUtil.isNotEmpty(blacklistUserIdList)) { - lqw.notIn(BusConstructionUser::getId, blacklistUserIdList); + lqw.notIn(SubConstructionUser::getId, blacklistUserIdList); } return lqw; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java similarity index 81% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java index 01a38279..1408247e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.project.service.impl; +package org.dromara.contractor.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdcardUtil; @@ -18,22 +18,28 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.project.constant.BusConstructionUserConstant; +import org.dromara.common.utils.IdCardEncryptorUtil; +import org.dromara.contractor.domain.SubConstructionUser; +import org.dromara.contractor.domain.SubConstructionUserFile; +import org.dromara.contractor.domain.SubContractor; +import org.dromara.contractor.domain.dto.constructionuser.*; +import org.dromara.contractor.domain.vo.constructionuser.*; +import org.dromara.contractor.domain.vo.contractor.SubContractorVo; +import org.dromara.contractor.service.ISubConstructionUserFileService; +import org.dromara.contractor.service.ISubConstructionUserService; +import org.dromara.contractor.service.ISubContractorService; +import org.dromara.contractor.constant.SubConstructionUserConstant; import org.dromara.project.domain.*; -import org.dromara.project.domain.dto.constructionuser.*; import org.dromara.project.domain.enums.BusAttendanceClockStatusEnum; import org.dromara.project.domain.enums.BusAttendanceCommuterEnum; import org.dromara.project.domain.enums.BusConstructionUserAttendanceStatusEnum; -import org.dromara.project.domain.enums.BusConstructionUserFileStatusEnum; -import org.dromara.project.domain.exportvo.BusConstructionUserExportVo; -import org.dromara.project.domain.vo.constructionuser.*; -import org.dromara.project.domain.vo.contractor.BusContractorVo; -import org.dromara.project.mapper.BusConstructionUserMapper; +import org.dromara.contractor.domain.enums.SubConstructionUserFileStatusEnum; +import org.dromara.contractor.domain.exportvo.BusConstructionUserExportVo; +import org.dromara.contractor.mapper.SubConstructionUserMapper; import org.dromara.project.service.*; import org.dromara.system.domain.vo.SysOssVo; import org.dromara.system.service.ISysDictTypeService; import org.dromara.system.service.ISysOssService; -import org.dromara.common.utils.IdCardEncryptorUtil; import org.springframework.beans.BeanUtils; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -50,15 +56,15 @@ import java.util.stream.Collectors; * @date 2025-03-07 */ @Service -public class BusConstructionUserServiceImpl extends ServiceImpl - implements IBusConstructionUserService { +public class SubConstructionUserServiceImpl extends ServiceImpl + implements ISubConstructionUserService { @Resource private IBusProjectService projectService; @Lazy @Resource - private IBusContractorService contractorService; + private ISubContractorService contractorService; @Lazy @Resource @@ -77,7 +83,7 @@ public class BusConstructionUserServiceImpl extends ServiceImpl queryPageList(BusConstructionUserQueryReq req, PageQuery pageQuery) { + public TableDataInfo queryPageList(SubConstructionUserQueryReq req, PageQuery pageQuery) { // 查询数据库 - Page result = this.page(pageQuery.build(), this.buildQueryWrapper(req)); + Page result = this.page(pageQuery.build(), this.buildQueryWrapper(req)); return TableDataInfo.build(getVoPage(result)); } @@ -126,7 +132,7 @@ public class BusConstructionUserServiceImpl extends ServiceImpl queryPageAttendanceList(BusConstructionUserAttendanceQueryReq req, + public TableDataInfo queryPageAttendanceList(SubConstructionUserAttendanceQueryReq req, PageQuery pageQuery) { return TableDataInfo.build(getAttendanceTotalVoPage(req, pageQuery)); } @@ -138,7 +144,7 @@ public class BusConstructionUserServiceImpl extends ServiceImpl queryAttendanceMonthList(BusConstructionUserAttendanceMonthReq req) { + public List queryAttendanceMonthList(SubConstructionUserAttendanceMonthReq req) { Long id = req.getUserId(); String clockMonth = req.getClockMonth(); if (this.getById(id) == null) { @@ -170,13 +176,13 @@ public class BusConstructionUserServiceImpl extends ServiceImpl> ossIdUrlMap = ossService.listByIds(picIds) .stream().collect(Collectors.groupingBy(SysOssVo::getOssId)); // 遍历每天，计算考勤状态 - List respList = new ArrayList<>(); + List respList = new ArrayList<>(); dateListMap.forEach((date, attendanceList) -> { - BusConstructionUserAttendanceMonthVo resp = new BusConstructionUserAttendanceMonthVo(); + SubConstructionUserAttendanceMonthVo resp = new SubConstructionUserAttendanceMonthVo(); resp.setId(id); resp.setClockDate(date); // 获取考勤记录 - BusConstructionUserAttendanceByDay day = BusConstructionUserAttendanceByDay.build(attendanceList); + SubConstructionUserAttendanceByDay day = SubConstructionUserAttendanceByDay.build(attendanceList); // 填充打卡图片url if (day != null) { if (day.getUpClockPicId() != null) { @@ -217,7 +223,7 @@ public class BusConstructionUserServiceImpl extends ServiceImpl queryList(BusConstructionUserQueryReq req) { - LambdaQueryWrapper lqw = this.buildQueryWrapper(req); - List constructionUserVoList = this.list(lqw).stream().map(this::getVo).toList(); + public List queryList(SubConstructionUserQueryReq req) { + LambdaQueryWrapper lqw = this.buildQueryWrapper(req); + List constructionUserVoList = this.list(lqw).stream().map(this::getVo).toList(); // 关联项目信息 - Set projectIdList = constructionUserVoList.stream().map(BusConstructionUserVo::getProjectId) + Set projectIdList = constructionUserVoList.stream().map(SubConstructionUserVo::getProjectId) .collect(Collectors.toSet()); Map> projectIdProjectMap = projectService.listByIds(projectIdList).stream() .collect(Collectors.groupingBy(BusProject::getId)); @@ -263,7 +269,7 @@ public class BusConstructionUserServiceImpl extends ServiceImpl attendancePeopleList = attendanceService.listAttendancePeopleByProjectId(projectId); @@ -291,9 +297,9 @@ public class BusConstructionUserServiceImpl extends ServiceImpl lambdaUpdate = Wrappers.lambdaUpdate(BusConstructionUser.class) - .eq(BusConstructionUser::getId, id) - .set(BusConstructionUser::getProjectId, req.getProjectId()) - .set(BusConstructionUser::getContractorId, req.getContractorId()); + LambdaUpdateWrapper lambdaUpdate = Wrappers.lambdaUpdate(SubConstructionUser.class) + .eq(SubConstructionUser::getId, id) + .set(SubConstructionUser::getProjectId, req.getProjectId()) + .set(SubConstructionUser::getContractorId, req.getContractorId()); return this.update(lambdaUpdate); } @@ -441,14 +447,14 @@ public class BusConstructionUserServiceImpl extends ServiceImpl idList = req.getIdList(); String status = req.getStatus(); // 查询对应数据是否存在 if (CollUtil.isEmpty(idList)) { throw new ServiceException("施工人员 id 不能为空", HttpStatus.BAD_REQUEST); } - List constructionUserList = this.listByIds(idList); + List constructionUserList = this.listByIds(idList); // 判断对应数据是否都存在 if (constructionUserList.size() != idList.size()) { throw new ServiceException("修改施工人员状态失败，数据缺失", HttpStatus.BAD_REQUEST); @@ -456,14 +462,14 @@ public class BusConstructionUserServiceImpl extends ServiceImpl projectIdList = constructionUserList.stream() - .map(BusConstructionUser::getProjectId) + .map(SubConstructionUser::getProjectId) .distinct().toList(); projectService.validAuth(projectIdList, userId); // 批量修改 - List list = constructionUserList.stream() + List list = constructionUserList.stream() .filter(user -> !status.equals(user.getStatus())) .map(user -> { - BusConstructionUser constructionUser = new BusConstructionUser(); + SubConstructionUser constructionUser = new SubConstructionUser(); constructionUser.setId(user.getId()); constructionUser.setStatus(status); return constructionUser; @@ -485,7 +491,7 @@ public class BusConstructionUserServiceImpl extends ServiceImpl lambdaUpdate = Wrappers.lambdaUpdate(BusConstructionUser.class) - .eq(BusConstructionUser::getProjectId, projectId) - .set(BusConstructionUser::getClock, clock); + LambdaUpdateWrapper lambdaUpdate = Wrappers.lambdaUpdate(SubConstructionUser.class) + .eq(SubConstructionUser::getProjectId, projectId) + .set(SubConstructionUser::getClock, clock); boolean update = this.update(lambdaUpdate); if (!update) { throw new ServiceException("修改施工人员打卡状态失败，数据库异常", HttpStatus.ERROR); @@ -516,7 +522,7 @@ public class BusConstructionUserServiceImpl extends ServiceImpl ids, Boolean isValid) { Long userId = LoginHelper.getUserId(); - List constructionUserList = this.listByIds(ids); + List constructionUserList = this.listByIds(ids); if (isValid) { // 做一些业务上的校验,判断是否需要校验 // 获取项目id列表 - List projectIdList = constructionUserList.stream().map(BusConstructionUser::getProjectId).toList(); + List projectIdList = constructionUserList.stream().map(SubConstructionUser::getProjectId).toList(); // 判断是否有权限操作对应项目下的内容 projectService.validAuth(projectIdList, userId); // 判断待删除的人员是否存在于班组 @@ -604,8 +610,8 @@ public class BusConstructionUserServiceImpl extends ServiceImpl constructionUserFileLqw = Wrappers.lambdaQuery(BusConstructionUserFile.class) - .in(BusConstructionUserFile::getUserId, ids); + LambdaQueryWrapper constructionUserFileLqw = Wrappers.lambdaQuery(SubConstructionUserFile.class) + .in(SubConstructionUserFile::getUserId, ids); boolean removeFile = constructionUserFileService.remove(constructionUserFileLqw); if (!removeFile) { throw new ServiceException("删除施工人员信息失败，施工人员文件信息删除失败", HttpStatus.ERROR); @@ -621,9 +627,9 @@ public class BusConstructionUserServiceImpl extends ServiceImpl buildQueryWrapper(BusConstructionUserQueryReq req) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + public LambdaQueryWrapper buildQueryWrapper(SubConstructionUserQueryReq req) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); if (req == null) { return lqw; } @@ -695,40 +701,40 @@ public class BusConstructionUserServiceImpl extends ServiceImpl wrapper - .ne(BusConstructionUser::getTeamId, notTeamId) - .or().isNull(BusConstructionUser::getTeamId)); + .ne(SubConstructionUser::getTeamId, notTeamId) + .or().isNull(SubConstructionUser::getTeamId)); } // 查询当前项目下的黑名单人员 if (projectId != null) { List blackUserIdList = constructionBlacklistService.queryIdListByProjectId(projectId); // 查询结果移除黑名单人员 if (CollUtil.isNotEmpty(blackUserIdList)) { - lqw.notIn(BusConstructionUser::getId, blackUserIdList); + lqw.notIn(SubConstructionUser::getId, blackUserIdList); } } return lqw; @@ -741,9 +747,9 @@ public class BusConstructionUserServiceImpl extends ServiceImpl getVoPage(Page constructionUserPage) { - List constructionUserList = constructionUserPage.getRecords(); - Page constructionUserVoPage = new Page<>( + public Page getVoPage(Page constructionUserPage) { + List constructionUserList = constructionUserPage.getRecords(); + Page constructionUserVoPage = new Page<>( constructionUserPage.getCurrent(), constructionUserPage.getSize(), constructionUserPage.getTotal()); @@ -751,39 +757,39 @@ public class BusConstructionUserServiceImpl extends ServiceImpl contractorIdSet = constructionUserList.stream().map(BusConstructionUser::getContractorId) + Set contractorIdSet = constructionUserList.stream().map(SubConstructionUser::getContractorId) .collect(Collectors.toSet()); - Map> contractorIdContractorMap = contractorService.listByIds(contractorIdSet).stream() - .collect(Collectors.groupingBy(BusContractor::getId)); + Map> contractorIdContractorMap = contractorService.listByIds(contractorIdSet).stream() + .collect(Collectors.groupingBy(SubContractor::getId)); // 关联查询工资标准 LambdaQueryWrapper workWageLqw = Wrappers.lambdaQuery(BusWorkWage.class) - .in(BusWorkWage::getProjectId, constructionUserList.stream().map(BusConstructionUser::getProjectId).toList()) - .in(BusWorkWage::getWorkType, constructionUserList.stream().map(BusConstructionUser::getTypeOfWork).toList()) - .in(BusWorkWage::getWageMeasureUnit, constructionUserList.stream().map(BusConstructionUser::getWageMeasureUnit).toList()); + .in(BusWorkWage::getProjectId, constructionUserList.stream().map(SubConstructionUser::getProjectId).toList()) + .in(BusWorkWage::getWorkType, constructionUserList.stream().map(SubConstructionUser::getTypeOfWork).toList()) + .in(BusWorkWage::getWageMeasureUnit, constructionUserList.stream().map(SubConstructionUser::getWageMeasureUnit).toList()); Map workWageMap = workWageService.list(workWageLqw).stream().collect(Collectors.toMap( workWage -> workWage.getWorkType() + "_" + workWage.getWageMeasureUnit(), BusWorkWage::getWage, (wage1, wage2) -> wage1 )); - int fileTypeSize = dictTypeService.selectDictDataByType(BusConstructionUserConstant.USER_FILE_TYPE).size(); + int fileTypeSize = dictTypeService.selectDictDataByType(SubConstructionUserConstant.USER_FILE_TYPE).size(); // 获取用户上传文件数量信息 - List userIdList = constructionUserList.stream().map(BusConstructionUser::getId).toList(); - List fileList = constructionUserFileService.lambdaQuery() - .select(BusConstructionUserFile::getId, BusConstructionUserFile::getUserId) - .in(BusConstructionUserFile::getUserId, userIdList) + List userIdList = constructionUserList.stream().map(SubConstructionUser::getId).toList(); + List fileList = constructionUserFileService.lambdaQuery() + .select(SubConstructionUserFile::getId, SubConstructionUserFile::getUserId) + .in(SubConstructionUserFile::getUserId, userIdList) .list(); Map fileCountMap = fileList.stream() .collect(Collectors.groupingBy( - BusConstructionUserFile::getUserId, + SubConstructionUserFile::getUserId, Collectors.counting() )); // 填充信息 - List constructionUserVoList = constructionUserList.stream().map(constructionUser -> { - BusConstructionUserVo constructionUserVo = new BusConstructionUserVo(); + List constructionUserVoList = constructionUserList.stream().map(constructionUser -> { + SubConstructionUserVo constructionUserVo = new SubConstructionUserVo(); BeanUtils.copyProperties(constructionUser, constructionUserVo); // 关联分包公司信息 Long contractorId = constructionUser.getContractorId(); - BusContractorVo contractor = null; + SubContractorVo contractor = null; if (contractorIdContractorMap.containsKey(contractorId)) { contractor = contractorService.getVo(contractorIdContractorMap.get(contractorId).getFirst()); } @@ -798,11 +804,11 @@ public class BusConstructionUserServiceImpl extends ServiceImpl getAttendanceTotalVoPage(BusConstructionUserAttendanceQueryReq req, + public Page getAttendanceTotalVoPage(SubConstructionUserAttendanceQueryReq req, PageQuery pageQuery) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); // 从对象中取值 String userName = req.getUserName(); Long projectId = req.getProjectId(); @@ -852,25 +858,25 @@ public class BusConstructionUserServiceImpl extends ServiceImpl userIdList = attendanceService.list(attendanceLqw) .stream().map(BusAttendance::getUserId).toList(); if (CollUtil.isNotEmpty(userIdList)) { - lqw.in(BusConstructionUser::getId, userIdList); + lqw.in(SubConstructionUser::getId, userIdList); } } // 模糊查询 - lqw.like(StringUtils.isNotBlank(userName), BusConstructionUser::getUserName, userName); + lqw.like(StringUtils.isNotBlank(userName), SubConstructionUser::getUserName, userName); // 精确查询 - lqw.eq(ObjectUtils.isNotEmpty(projectId), BusConstructionUser::getProjectId, projectId); - lqw.eq(ObjectUtils.isNotEmpty(teamId), BusConstructionUser::getTeamId, teamId); - lqw.eq(StringUtils.isNotBlank(typeOfWork), BusConstructionUser::getTypeOfWork, typeOfWork); + lqw.eq(ObjectUtils.isNotEmpty(projectId), SubConstructionUser::getProjectId, projectId); + lqw.eq(ObjectUtils.isNotEmpty(teamId), SubConstructionUser::getTeamId, teamId); + lqw.eq(StringUtils.isNotBlank(typeOfWork), SubConstructionUser::getTypeOfWork, typeOfWork); // 查询当前项目下的黑名单人员 List blackUserIdList = constructionBlacklistService.queryIdListByProjectId(projectId); // 查询结果移除黑名单人员 if (CollUtil.isNotEmpty(blackUserIdList)) { - lqw.notIn(BusConstructionUser::getId, blackUserIdList); + lqw.notIn(SubConstructionUser::getId, blackUserIdList); } // 分页查询获取数据 - Page constructionUserPage = this.page(pageQuery.build(), lqw); - List constructionUserList = constructionUserPage.getRecords(); - Page constructionUserAttendanceTotalPage = new Page<>( + Page constructionUserPage = this.page(pageQuery.build(), lqw); + List constructionUserList = constructionUserPage.getRecords(); + Page constructionUserAttendanceTotalPage = new Page<>( constructionUserPage.getCurrent(), constructionUserPage.getSize(), constructionUserPage.getTotal()); @@ -878,14 +884,14 @@ public class BusConstructionUserServiceImpl extends ServiceImpl userIdList = constructionUserList.stream().map(BusConstructionUser::getId).toList(); + List userIdList = constructionUserList.stream().map(SubConstructionUser::getId).toList(); // 关联查询施工人员考勤列表 attendanceLqw.in(BusAttendance::getUserId, userIdList); Map> userIdBusAttendanceListMap = attendanceService.list(attendanceLqw) .stream().collect(Collectors.groupingBy(BusAttendance::getUserId)); // 填充信息 - List userAttendanceTotalList = constructionUserList.stream().map(constructionUser -> { - BusConstructionUserAttendanceTotalVo constructionUserAttendanceTotalResp = new BusConstructionUserAttendanceTotalVo(); + List userAttendanceTotalList = constructionUserList.stream().map(constructionUser -> { + SubConstructionUserAttendanceTotalVo constructionUserAttendanceTotalResp = new SubConstructionUserAttendanceTotalVo(); Long id = constructionUser.getId(); BeanUtils.copyProperties(constructionUser, constructionUserAttendanceTotalResp); // 关联施工人员考勤信息 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubContractorMaterialRecordServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubContractorMaterialRecordServiceImpl.java new file mode 100644 index 00000000..14fe751e --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubContractorMaterialRecordServiceImpl.java @@ -0,0 +1,302 @@ +package org.dromara.contractor.service.impl; + +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jakarta.annotation.Resource; +import org.dromara.common.core.constant.HttpStatus; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.ObjectUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.contractor.domain.SubContractor; +import org.dromara.contractor.domain.SubContractorMaterial; +import org.dromara.contractor.domain.SubContractorMaterialRecord; +import org.dromara.contractor.domain.dto.contractormaterialrecord.SubContractorMaterialRecordCreateReq; +import org.dromara.contractor.domain.dto.contractormaterialrecord.SubContractorMaterialRecordQueryReq; +import org.dromara.contractor.domain.dto.contractormaterialrecord.SubContractorMaterialRecordUpdateReq; +import org.dromara.contractor.domain.enums.SubContractorRecordEnum; +import org.dromara.contractor.domain.vo.contractormaterialrecord.SubContractorMaterialRecordVo; +import org.dromara.contractor.mapper.SubContractorMaterialRecordMapper; +import org.dromara.contractor.service.ISubContractorMaterialRecordService; +import org.dromara.contractor.service.ISubContractorMaterialService; +import org.dromara.contractor.service.ISubContractorService; +import org.dromara.project.service.IBusProjectService; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.math.BigDecimal; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * 分包方物料记录Service业务层处理 + * + * @author lcj + * @date 2025-06-27 + */ +@Service +public class SubContractorMaterialRecordServiceImpl extends ServiceImpl + implements ISubContractorMaterialRecordService { + + @Resource + private IBusProjectService projectService; + + @Resource + private ISubContractorService contractorService; + + @Resource + private ISubContractorMaterialService contractorMaterialService; + + /** + * 查询分包方物料记录 + * + * @param id 主键 + * @return 分包方物料记录 + */ + @Override + public SubContractorMaterialRecordVo queryById(Long id) { + SubContractorMaterialRecord entity = this.getById(id); + if (entity == null) { + throw new ServiceException("分包方物料记录信息不存在", HttpStatus.NOT_FOUND); + } + return this.getVo(entity); + } + + /** + * 分页查询分包方物料记录列表 + * + * @param req 查询条件 + * @param pageQuery 分页参数 + * @return 分包方物料记录分页列表 + */ + @Override + public TableDataInfo queryPageList(SubContractorMaterialRecordQueryReq req, PageQuery pageQuery) { + Page result = this.page(pageQuery.build(), this.buildQueryWrapper(req)); + return TableDataInfo.build(this.getVoPage(result)); + } + + /** + * 查询符合条件的分包方物料记录列表 + * + * @param req 查询条件 + * @return 分包方物料记录列表 + */ + @Override + public List queryList(SubContractorMaterialRecordQueryReq req) { + LambdaQueryWrapper lqw = buildQueryWrapper(req); + return this.list(lqw).stream().map(this::getVo).toList(); + } + + /** + * 新增分包方物料记录 + * + * @param req 分包方物料记录 + * @return 新增分包方物料记录主键id + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Long insertByBo(SubContractorMaterialRecordCreateReq req) { + SubContractorMaterialRecord entry = new SubContractorMaterialRecord(); + BeanUtils.copyProperties(req, entry); + Long contractorMaterialId = req.getContractorMaterialId(); + if (contractorMaterialId == null) { + throw new ServiceException("物料id不能为空", HttpStatus.BAD_REQUEST); + } + SubContractorMaterial contractorMaterial = contractorMaterialService.getById(contractorMaterialId); + if (contractorMaterial == null) { + throw new ServiceException("分包方物料不存在", HttpStatus.NOT_FOUND); + } + // 填充默认值 + entry.setProjectId(contractorMaterial.getProjectId()); + entry.setContractorId(contractorMaterial.getContractorId()); + String recordType = req.getRecordType(); + BigDecimal recordNumber = req.getRecordNumber(); + // 同步更新工具数量 + BigDecimal number = this.computeRemainingMaterialNumber(contractorMaterial, recordType, recordNumber); + entry.setRemainingNumber(number); + boolean save = this.save(entry); + if (!save) { + throw new ServiceException("保存分包方物料记录失败", HttpStatus.ERROR); + } + return entry.getId(); + } + + /** + * 修改分包方物料记录 + * + * @param req 分包方物料记录 + * @return 是否修改成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(SubContractorMaterialRecordUpdateReq req) { + SubContractorMaterialRecord entry = new SubContractorMaterialRecord(); + BeanUtils.copyProperties(req, entry); + SubContractorMaterialRecord contractorMaterialEntry = this.getById(entry.getId()); + if (contractorMaterialEntry == null) { + throw new ServiceException("修改分包方物料记录失败，数据不存在", HttpStatus.NOT_FOUND); + } + SubContractorMaterial contractorMaterial = contractorMaterialService.getById(contractorMaterialEntry.getContractorMaterialId()); + if (contractorMaterial == null) { + throw new ServiceException("分包方物料不存在", HttpStatus.NOT_FOUND); + } + String recordType = contractorMaterialEntry.getRecordType(); + BigDecimal recordNumber = req.getRecordNumber(); + // 同步更新工具数量 + BigDecimal number = this.computeRemainingMaterialNumber(contractorMaterial, recordType, recordNumber); + entry.setRemainingNumber(number); + boolean result = this.updateById(entry); + if (!result) { + throw new ServiceException("修改分包方物料记录失败", HttpStatus.ERROR); + } + return true; + } + + + /** + * 校验并批量删除分包方物料记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + Long userId = LoginHelper.getUserId(); + List list = this.listByIds(ids); + if (isValid) { + List projectIdList = list.stream().map(SubContractorMaterialRecord::getProjectId).toList(); + projectService.validAuth(projectIdList, userId); + } + return this.removeBatchByIds(ids); + } + + /** + * 获取分包方物料记录视图对象 + * + * @param contractorMaterialRecord 分包方物料记录对象 + * @return 分包方物料记录视图对象 + */ + @Override + public SubContractorMaterialRecordVo getVo(SubContractorMaterialRecord contractorMaterialRecord) { + SubContractorMaterialRecordVo vo = new SubContractorMaterialRecordVo(); + if (contractorMaterialRecord == null) { + throw new ServiceException("数据不存在"); + } + BeanUtils.copyProperties(contractorMaterialRecord, vo); + SubContractorMaterial contractorMaterial = contractorMaterialService.getById(vo.getContractorMaterialId()); + if (contractorMaterial != null) { + vo.setContractorMaterialName(contractorMaterial.getMaterialName()); + } + SubContractor contractor = contractorService.getById(vo.getContractorId()); + if (contractor != null) { + vo.setContractorName(contractor.getName()); + } + return vo; + } + + /** + * 获取分包方物料记录查询条件封装 + * + * @param req 分包方物料记录查询条件 + * @return 分包方物料记录查询条件封装 + */ + @Override + public LambdaQueryWrapper buildQueryWrapper(SubContractorMaterialRecordQueryReq req) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + if (req == null) { + return lqw; + } + Long projectId = req.getProjectId(); + Long contractorId = req.getContractorId(); + Long contractorMaterialId = req.getContractorMaterialId(); + String recordType = req.getRecordType(); + String usedPosition = req.getUsedPosition(); + lqw.eq(ObjectUtils.isNotEmpty(projectId), SubContractorMaterialRecord::getProjectId, projectId); + lqw.eq(ObjectUtils.isNotEmpty(contractorId), SubContractorMaterialRecord::getContractorId, contractorId); + lqw.eq(ObjectUtils.isNotEmpty(contractorMaterialId), SubContractorMaterialRecord::getContractorMaterialId, contractorMaterialId); + lqw.eq(StringUtils.isNotBlank(recordType), SubContractorMaterialRecord::getRecordType, recordType); + lqw.like(StringUtils.isNotBlank(usedPosition), SubContractorMaterialRecord::getUsedPosition, usedPosition); + return lqw; + } + + /** + * 获取分包方物料记录分页对象视图 + * + * @param contractorMaterialRecordPage 分包方物料记录分页对象 + * @return 分包方物料记录分页对象视图 + */ + @Override + public Page getVoPage(Page contractorMaterialRecordPage) { + List contractorMaterialEntryList = contractorMaterialRecordPage.getRecords(); + Page contractorMaterialEntryVoPage = new Page<>( + contractorMaterialRecordPage.getCurrent(), + contractorMaterialRecordPage.getSize(), + contractorMaterialRecordPage.getTotal()); + if (CollUtil.isEmpty(contractorMaterialEntryList)) { + return contractorMaterialEntryVoPage; + } + Set contractorIdList = contractorMaterialEntryList.stream().map(SubContractorMaterialRecord::getContractorId).collect(Collectors.toSet()); + Map contractorMap = contractorService.listByIds(contractorIdList) + .stream().collect(Collectors.toMap(SubContractor::getId, v -> v)); + Set contractorMaterialIdList = contractorMaterialEntryList.stream().map(SubContractorMaterialRecord::getContractorMaterialId).collect(Collectors.toSet()); + Map contractorMaterialMap = contractorMaterialService.listByIds(contractorMaterialIdList) + .stream().collect(Collectors.toMap(SubContractorMaterial::getId, v -> v)); + List contractorMaterialEntryVoList = contractorMaterialEntryList.stream().map(entity -> { + SubContractorMaterialRecordVo vo = new SubContractorMaterialRecordVo(); + BeanUtils.copyProperties(entity, vo); + if (contractorMaterialMap.containsKey(entity.getContractorMaterialId())) { + vo.setContractorMaterialName(contractorMaterialMap.get(entity.getContractorMaterialId()).getMaterialName()); + } + if (contractorMap.containsKey(entity.getContractorId())) { + vo.setContractorName(contractorMap.get(entity.getContractorId()).getName()); + } + return vo; + }).toList(); + contractorMaterialEntryVoPage.setRecords(contractorMaterialEntryVoList); + return contractorMaterialEntryVoPage; + } + + /** + * 计算剩余库存并更新库存对象返回剩余数量 + * + * @param contractorMaterial 当前库存工具 + * @param recordType 操作类型（入库/出库） + * @param recordNumber 本次操作数量 + * @return 剩余数量 + */ + private BigDecimal computeRemainingMaterialNumber(SubContractorMaterial contractorMaterial, String recordType, BigDecimal recordNumber) { + if (recordNumber == null) { + throw new ServiceException("物料数量不能为空", HttpStatus.ERROR); + } + BigDecimal materialNumber = contractorMaterial.getMaterialNumber(); + SubContractorMaterial newContractorMaterial = new SubContractorMaterial(); + newContractorMaterial.setId(contractorMaterial.getId()); + BigDecimal result; + if (SubContractorRecordEnum.PUT.getValue().equals(recordType)) { + result = materialNumber.add(recordNumber); + } else if (SubContractorRecordEnum.OUT.getValue().equals(recordType)) { + result = materialNumber.subtract(recordNumber); + if (result.compareTo(BigDecimal.ZERO) < 0) { + throw new ServiceException("出库数量不能大于库存数量", HttpStatus.ERROR); + } + } else { + throw new ServiceException("分包方物料记录类型错误", HttpStatus.BAD_REQUEST); + } + newContractorMaterial.setMaterialNumber(result); + boolean update = contractorMaterialService.updateById(newContractorMaterial); + if (!update) { + throw new ServiceException("更新分包方物料信息异常", HttpStatus.ERROR); + } + return result; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubContractorMaterialServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubContractorMaterialServiceImpl.java new file mode 100644 index 00000000..d2f6cd6a --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubContractorMaterialServiceImpl.java @@ -0,0 +1,246 @@ +package org.dromara.contractor.service.impl; + +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jakarta.annotation.Resource; +import org.dromara.common.core.constant.HttpStatus; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.ObjectUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.contractor.domain.SubContractor; +import org.dromara.contractor.domain.SubContractorMaterial; +import org.dromara.contractor.domain.dto.contractormaterial.SubContractorMaterialCreateReq; +import org.dromara.contractor.domain.dto.contractormaterial.SubContractorMaterialQueryReq; +import org.dromara.contractor.domain.dto.contractormaterial.SubContractorMaterialUpdateReq; +import org.dromara.contractor.domain.vo.contractormaterial.SubContractorMaterialVo; +import org.dromara.contractor.mapper.SubContractorMaterialMapper; +import org.dromara.contractor.service.ISubContractorMaterialService; +import org.dromara.contractor.service.ISubContractorService; +import org.dromara.project.service.IBusProjectService; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * 分包方物料Service业务层处理 + * + * @author lcj + * @date 2025-06-27 + */ +@Service +public class SubContractorMaterialServiceImpl extends ServiceImpl + implements ISubContractorMaterialService { + + @Resource + private IBusProjectService projectService; + + @Resource + private ISubContractorService contractorService; + + /** + * 查询分包方物料 + * + * @param id 主键 + * @return 分包方物料 + */ + @Override + public SubContractorMaterialVo queryById(Long id) { + SubContractorMaterial contractorMaterial = this.getById(id); + if (contractorMaterial == null) { + throw new ServiceException("分包方物料信息不存在", HttpStatus.NOT_FOUND); + } + return this.getVo(contractorMaterial); + } + + /** + * 分页查询分包方物料列表 + * + * @param req 查询条件 + * @param pageQuery 分页参数 + * @return 分包方物料分页列表 + */ + @Override + public TableDataInfo queryPageList(SubContractorMaterialQueryReq req, PageQuery pageQuery) { + Page result = this.page(pageQuery.build(), this.buildQueryWrapper(req)); + return TableDataInfo.build(this.getVoPage(result)); + } + + /** + * 查询符合条件的分包方物料列表 + * + * @param req 查询条件 + * @return 分包方物料列表 + */ + @Override + public List queryList(SubContractorMaterialQueryReq req) { + LambdaQueryWrapper lqw = this.buildQueryWrapper(req); + return this.list(lqw).stream().map(this::getVo).toList(); + } + + /** + * 新增分包方物料 + * + * @param req 分包方物料 + * @return 新增分包物料主键id + */ + @Override + public Long insertByBo(SubContractorMaterialCreateReq req) { + SubContractorMaterial contractorMaterial = new SubContractorMaterial(); + BeanUtils.copyProperties(req, contractorMaterial); + validEntityBeforeSave(contractorMaterial, true); + boolean result = this.save(contractorMaterial); + if (!result) { + throw new ServiceException("分包方物料新增失败", HttpStatus.ERROR); + } + return contractorMaterial.getId(); + } + + /** + * 修改分包方物料 + * + * @param req 分包方物料 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(SubContractorMaterialUpdateReq req) { + Long id = req.getId(); + SubContractorMaterial oldContractorMaterial = this.getById(id); + if (oldContractorMaterial == null) { + throw new ServiceException("修改分包方物料失败，数据不存在", HttpStatus.NOT_FOUND); + } + SubContractorMaterial contractorMaterial = new SubContractorMaterial(); + BeanUtils.copyProperties(req, contractorMaterial); + validEntityBeforeSave(contractorMaterial, false); + boolean result = this.updateById(contractorMaterial); + if (!result) { + throw new ServiceException("修改分包方物料失败", HttpStatus.ERROR); + } + return true; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(SubContractorMaterial entity, Boolean create) { + Long projectId = entity.getProjectId(); + Long contractorId = entity.getContractorId(); + if (create) { + if (projectId == null) { + throw new ServiceException("项目 id 不能为空", HttpStatus.BAD_REQUEST); + } + if (contractorId == null) { + throw new ServiceException("合同方 id 不能为空", HttpStatus.BAD_REQUEST); + } + } + if (projectId != null && projectService.getById(projectId) == null) { + throw new ServiceException("对应项目不存在", HttpStatus.NOT_FOUND); + } + if (contractorId != null && contractorService.getById(contractorId) == null) { + throw new ServiceException("对应分包方不存在", HttpStatus.NOT_FOUND); + } + } + + /** + * 校验并批量删除分包方物料信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + Long userId = LoginHelper.getUserId(); + List contractorMaterialList = this.listByIds(ids); + if (isValid) { + //TODO 做一些业务上的校验,判断是否需要校验 + List projectIdList = contractorMaterialList.stream().map(SubContractorMaterial::getProjectId).distinct().toList(); + projectService.validAuth(projectIdList, userId); + } + return this.removeBatchByIds(ids); + } + + /** + * 获取分包方物料视图对象 + * + * @param contractorMaterial 分包方物料对象 + * @return 分包方物料视图对象 + */ + @Override + public SubContractorMaterialVo getVo(SubContractorMaterial contractorMaterial) { + SubContractorMaterialVo contractorMaterialVo = new SubContractorMaterialVo(); + if (contractorMaterial == null) { + return contractorMaterialVo; + } + BeanUtils.copyProperties(contractorMaterial, contractorMaterialVo); + Long contractorId = contractorMaterial.getContractorId(); + SubContractor contractor = contractorService.getById(contractorId); + contractorMaterialVo.setContractorName(contractor.getName()); + return contractorMaterialVo; + } + + /** + * 获取分包方物料查询条件封装 + * + * @param req 分包方物料查询条件 + * @return 分包方物料查询条件封装 + */ + @Override + public LambdaQueryWrapper buildQueryWrapper(SubContractorMaterialQueryReq req) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + Long projectId = req.getProjectId(); + Long contractorId = req.getContractorId(); + String materialName = req.getMaterialName(); + String materialType = req.getMaterialType(); + String materialModel = req.getMaterialModel(); + lqw.eq(ObjectUtils.isNotEmpty(projectId), SubContractorMaterial::getProjectId, projectId); + lqw.eq(ObjectUtils.isNotEmpty(contractorId), SubContractorMaterial::getContractorId, contractorId); + lqw.eq(StringUtils.isNotBlank(materialType), SubContractorMaterial::getMaterialModel, materialType); + lqw.like(StringUtils.isNotBlank(materialName), SubContractorMaterial::getMaterialName, materialName); + lqw.like(StringUtils.isNotBlank(materialModel), SubContractorMaterial::getMaterialModel, materialModel); + return lqw; + } + + /** + * 获取分包方物料分页对象视图 + * + * @param contractorPage 分包方物料分页对象 + * @return 分包方物料分页对象视图 + */ + @Override + public Page getVoPage(Page contractorPage) { + List contractorMaterialList = contractorPage.getRecords(); + Page contractorMaterialVoPage = new Page<>( + contractorPage.getCurrent(), + contractorPage.getSize(), + contractorPage.getTotal()); + if (CollUtil.isEmpty(contractorMaterialList)) { + return contractorMaterialVoPage; + } + Set contractorIdList = contractorMaterialList.stream().map(SubContractorMaterial::getContractorId).collect(Collectors.toSet()); + Map contractorMap = contractorService.listByIds(contractorIdList) + .stream().collect(Collectors.toMap(SubContractor::getId, v -> v)); + List contractorMaterialVoList = contractorMaterialList.stream().map(contractorMaterial -> { + SubContractorMaterialVo contractorMaterialVo = new SubContractorMaterialVo(); + BeanUtils.copyProperties(contractorMaterial, contractorMaterialVo); + Long contractorId = contractorMaterial.getContractorId(); + if (contractorMap.containsKey(contractorId)) { + contractorMaterialVo.setContractorName(contractorMap.get(contractorId).getName()); + } + return contractorMaterialVo; + }).toList(); + contractorMaterialVoPage.setRecords(contractorMaterialVoList); + return contractorMaterialVoPage; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusContractorServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubContractorServiceImpl.java similarity index 77% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusContractorServiceImpl.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubContractorServiceImpl.java index 990b0bf4..5a473bb8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusContractorServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubContractorServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.project.service.impl; +package org.dromara.contractor.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.PhoneUtil; @@ -16,16 +16,16 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.project.domain.BusConstructionUser; -import org.dromara.project.domain.BusContractor; +import org.dromara.contractor.domain.SubConstructionUser; +import org.dromara.contractor.domain.SubContractor; +import org.dromara.contractor.domain.dto.contractor.SubContractorCreateReq; +import org.dromara.contractor.domain.dto.contractor.SubContractorQueryReq; +import org.dromara.contractor.domain.dto.contractor.SubContractorUpdateReq; +import org.dromara.contractor.domain.vo.contractor.SubContractorVo; +import org.dromara.contractor.mapper.SubContractorMapper; +import org.dromara.contractor.service.ISubContractorService; import org.dromara.project.domain.BusProject; -import org.dromara.project.domain.dto.contractor.BusContractorCreateReq; -import org.dromara.project.domain.dto.contractor.BusContractorQueryReq; -import org.dromara.project.domain.dto.contractor.BusContractorUpdateReq; -import org.dromara.project.domain.vo.contractor.BusContractorVo; -import org.dromara.project.mapper.BusContractorMapper; -import org.dromara.project.service.IBusConstructionUserService; -import org.dromara.project.service.IBusContractorService; +import org.dromara.contractor.service.ISubConstructionUserService; import org.dromara.project.service.IBusProjectService; import org.dromara.system.domain.bo.SysDeptBo; import org.dromara.system.service.ISysDeptService; @@ -46,11 +46,11 @@ import java.util.Map; * @date 2025-03-07 */ @Service -public class BusContractorServiceImpl extends ServiceImpl - implements IBusContractorService { +public class SubContractorServiceImpl extends ServiceImpl + implements ISubContractorService { @Resource - private IBusConstructionUserService constructionUserService; + private ISubConstructionUserService constructionUserService; @Resource private IBusProjectService projectService; @@ -68,8 +68,8 @@ public class BusContractorServiceImpl extends ServiceImpl queryPageList(BusContractorQueryReq req, PageQuery pageQuery) { + public TableDataInfo queryPageList(SubContractorQueryReq req, PageQuery pageQuery) { // 查询数据库 - Page result = this.page(pageQuery.build(), this.buildQueryWrapper(req)); + Page result = this.page(pageQuery.build(), this.buildQueryWrapper(req)); return TableDataInfo.build(this.getVoPage(result)); } @@ -97,9 +97,9 @@ public class BusContractorServiceImpl extends ServiceImpl queryList(BusContractorQueryReq req) { - LambdaQueryWrapper lqw = this.buildQueryWrapper(req); - List list = this.list(lqw); + public List queryList(SubContractorQueryReq req) { + LambdaQueryWrapper lqw = this.buildQueryWrapper(req); + List list = this.list(lqw); return list.stream().map(this::getVo).toList(); } @@ -111,9 +111,9 @@ public class BusContractorServiceImpl extends ServiceImpl fileMap = req.getFileMap(); @@ -122,7 +122,7 @@ public class BusContractorServiceImpl extends ServiceImpl 0) { throw new ServiceException("分包单位名称重复", HttpStatus.BAD_REQUEST); } @@ -166,9 +166,9 @@ public class BusContractorServiceImpl extends ServiceImpl fileMap = req.getFileMap(); @@ -177,13 +177,13 @@ public class BusContractorServiceImpl extends ServiceImpl 0) { throw new ServiceException("分包单位名称重复", HttpStatus.BAD_REQUEST); } @@ -195,7 +195,7 @@ public class BusContractorServiceImpl extends ServiceImpl ids, Boolean isValid) { Long userId = LoginHelper.getUserId(); - List contractorList = this.listByIds(ids); + List contractorList = this.listByIds(ids); // 做一些业务上的校验,判断是否需要校验 if (isValid) { // 仅当前项目下的用户可以删除 - List projectIdList = contractorList.stream().map(BusContractor::getProjectId).toList(); + List projectIdList = contractorList.stream().map(SubContractor::getProjectId).toList(); projectService.validAuth(projectIdList, userId); // 判断当前分包公司下是否还包含施工人员 - QueryWrapper queryWrapper = new QueryWrapper<>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("contractor_id", ids); if (constructionUserService.count(queryWrapper) > 0) { throw new ServiceException("删除分包单位失败，删除分包单位下存在施工人员", HttpStatus.BAD_REQUEST); @@ -258,9 +258,9 @@ public class BusContractorServiceImpl extends ServiceImpl buildQueryWrapper(BusContractorQueryReq req) { - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + public LambdaQueryWrapper buildQueryWrapper(SubContractorQueryReq req) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); if (req == null) { return lqw; } @@ -300,16 +300,16 @@ public class BusContractorServiceImpl extends ServiceImpl getVoPage(Page contractorPage) { - List contractorList = contractorPage.getRecords(); - Page contractorVoPage = new Page<>( + public Page getVoPage(Page contractorPage) { + List contractorList = contractorPage.getRecords(); + Page contractorVoPage = new Page<>( contractorPage.getCurrent(), contractorPage.getSize(), contractorPage.getTotal()); if (CollUtil.isEmpty(contractorList)) { return contractorVoPage; } - List contractorVoList = contractorList.stream().map(this::getVo).toList(); + List contractorVoList = contractorList.stream().map(this::getVo).toList(); contractorVoPage.setRecords(contractorVoList); return contractorVoPage; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubContractorToolRecordServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubContractorToolRecordServiceImpl.java index 63283021..7571eb88 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubContractorToolRecordServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubContractorToolRecordServiceImpl.java @@ -12,22 +12,24 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.contractor.domain.SubContractor; +import org.dromara.contractor.domain.SubContractorTool; import org.dromara.contractor.domain.SubContractorToolRecord; import org.dromara.contractor.domain.dto.contractortoolentry.SubContractorToolRecordCreateReq; import org.dromara.contractor.domain.dto.contractortoolentry.SubContractorToolRecordQueryReq; import org.dromara.contractor.domain.dto.contractortoolentry.SubContractorToolRecordUpdateReq; +import org.dromara.contractor.domain.enums.SubContractorRecordEnum; import org.dromara.contractor.domain.vo.contractortoolentry.SubContractorToolRecordVo; import org.dromara.contractor.mapper.SubContractorToolRecordMapper; +import org.dromara.contractor.service.ISubContractorService; import org.dromara.contractor.service.ISubContractorToolRecordService; -import org.dromara.project.domain.BusContractor; -import org.dromara.project.domain.BusContractorTool; -import org.dromara.project.service.IBusContractorService; -import org.dromara.project.service.IBusContractorToolService; +import org.dromara.contractor.service.ISubContractorToolService; import org.dromara.project.service.IBusProjectService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.util.Collection; import java.util.List; import java.util.Map; @@ -48,10 +50,10 @@ public class SubContractorToolRecordServiceImpl extends ServiceImpl getVoPage(Page contractorToolEntryPage) { - List contractorToolEntryList = contractorToolEntryPage.getRecords(); + public Page getVoPage(Page contractorToolRecordPage) { + List contractorToolEntryList = contractorToolRecordPage.getRecords(); Page contractorToolEntryVoPage = new Page<>( - contractorToolEntryPage.getCurrent(), - contractorToolEntryPage.getSize(), - contractorToolEntryPage.getTotal()); + contractorToolRecordPage.getCurrent(), + contractorToolRecordPage.getSize(), + contractorToolRecordPage.getTotal()); if (CollUtil.isEmpty(contractorToolEntryList)) { return contractorToolEntryVoPage; } Set contractorIdList = contractorToolEntryList.stream().map(SubContractorToolRecord::getContractorId).collect(Collectors.toSet()); - Map contractorMap = contractorService.listByIds(contractorIdList) - .stream().collect(Collectors.toMap(BusContractor::getId, v -> v)); + Map contractorMap = contractorService.listByIds(contractorIdList) + .stream().collect(Collectors.toMap(SubContractor::getId, v -> v)); Set contractorToolIdList = contractorToolEntryList.stream().map(SubContractorToolRecord::getContractorToolId).collect(Collectors.toSet()); - Map contractorToolMap = contractorToolService.listByIds(contractorToolIdList) - .stream().collect(Collectors.toMap(BusContractorTool::getId, v -> v)); + Map contractorToolMap = contractorToolService.listByIds(contractorToolIdList) + .stream().collect(Collectors.toMap(SubContractorTool::getId, v -> v)); List contractorToolEntryVoList = contractorToolEntryList.stream().map(entity -> { SubContractorToolRecordVo vo = new SubContractorToolRecordVo(); BeanUtils.copyProperties(entity, vo); @@ -247,4 +267,39 @@ public class SubContractorToolRecordServiceImpl extends ServiceImpl - implements IBusContractorToolService { +public class SubContractorToolServiceImpl extends ServiceImpl + implements ISubContractorToolService { @Resource private IBusProjectService projectService; @Resource - private IBusContractorService contractorService; + private ISubContractorService contractorService; /** * 查询分包方工器具 @@ -55,8 +55,8 @@ public class BusContractorToolServiceImpl extends ServiceImpl queryPageList(BusContractorToolQueryReq req, PageQuery pageQuery) { - Page result = this.page(pageQuery.build(), this.buildQueryWrapper(req)); + public TableDataInfo queryPageList(SubContractorToolQueryReq req, PageQuery pageQuery) { + Page result = this.page(pageQuery.build(), this.buildQueryWrapper(req)); return TableDataInfo.build(this.getVoPage(result)); } @@ -83,8 +83,8 @@ public class BusContractorToolServiceImpl extends ServiceImpl queryList(BusContractorToolQueryReq req) { - LambdaQueryWrapper lqw = this.buildQueryWrapper(req); + public List queryList(SubContractorToolQueryReq req) { + LambdaQueryWrapper lqw = this.buildQueryWrapper(req); return this.list(lqw).stream().map(this::getVo).toList(); } @@ -95,8 +95,8 @@ public class BusContractorToolServiceImpl extends ServiceImpl ids, Boolean isValid) { Long userId = LoginHelper.getUserId(); - List contractorToolList = this.listByIds(ids); + List contractorToolList = this.listByIds(ids); if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 - List projectIdList = contractorToolList.stream().map(BusContractorTool::getProjectId).distinct().toList(); + List projectIdList = contractorToolList.stream().map(SubContractorTool::getProjectId).distinct().toList(); projectService.validAuth(projectIdList, userId); } return this.removeBatchByIds(ids); @@ -178,14 +178,14 @@ public class BusContractorToolServiceImpl extends ServiceImpl buildQueryWrapper(BusContractorToolQueryReq req) { - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + public LambdaQueryWrapper buildQueryWrapper(SubContractorToolQueryReq req) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); Long projectId = req.getProjectId(); Long contractorId = req.getContractorId(); String toolName = req.getToolName(); String toolType = req.getToolType(); String toolModel = req.getToolModel(); - lqw.eq(ObjectUtils.isNotEmpty(projectId), BusContractorTool::getProjectId, projectId); - lqw.eq(ObjectUtils.isNotEmpty(contractorId), BusContractorTool::getContractorId, contractorId); - lqw.eq(StringUtils.isNotBlank(toolType), BusContractorTool::getToolType, toolType); - lqw.like(StringUtils.isNotBlank(toolName), BusContractorTool::getToolName, toolName); - lqw.like(StringUtils.isNotBlank(toolModel), BusContractorTool::getToolModel, toolModel); + lqw.eq(ObjectUtils.isNotEmpty(projectId), SubContractorTool::getProjectId, projectId); + lqw.eq(ObjectUtils.isNotEmpty(contractorId), SubContractorTool::getContractorId, contractorId); + lqw.eq(StringUtils.isNotBlank(toolType), SubContractorTool::getToolType, toolType); + lqw.like(StringUtils.isNotBlank(toolName), SubContractorTool::getToolName, toolName); + lqw.like(StringUtils.isNotBlank(toolModel), SubContractorTool::getToolModel, toolModel); return lqw; } @@ -219,20 +219,20 @@ public class BusContractorToolServiceImpl extends ServiceImpl getVoPage(Page contractorPage) { - List contractorToolList = contractorPage.getRecords(); - Page contractorToolVoPage = new Page<>( + public Page getVoPage(Page contractorPage) { + List contractorToolList = contractorPage.getRecords(); + Page contractorToolVoPage = new Page<>( contractorPage.getCurrent(), contractorPage.getSize(), contractorPage.getTotal()); if (CollUtil.isEmpty(contractorToolList)) { return contractorToolVoPage; } - Set contractorIdList = contractorToolList.stream().map(BusContractorTool::getContractorId).collect(Collectors.toSet()); - Map contractorMap = contractorService.listByIds(contractorIdList) - .stream().collect(Collectors.toMap(BusContractor::getId, v -> v)); - List contractorToolVoList = contractorToolList.stream().map(contractorTool -> { - BusContractorToolVo contractorToolVo = new BusContractorToolVo(); + Set contractorIdList = contractorToolList.stream().map(SubContractorTool::getContractorId).collect(Collectors.toSet()); + Map contractorMap = contractorService.listByIds(contractorIdList) + .stream().collect(Collectors.toMap(SubContractor::getId, v -> v)); + List contractorToolVoList = contractorToolList.stream().map(contractorTool -> { + SubContractorToolVo contractorToolVo = new SubContractorToolVo(); BeanUtils.copyProperties(contractorTool, contractorToolVo); Long contractorId = contractorTool.getContractorId(); if (contractorMap.containsKey(contractorId)) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusSubcontractServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubSubcontractServiceImpl.java similarity index 68% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusSubcontractServiceImpl.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubSubcontractServiceImpl.java index d14992f7..20ded4cc 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusSubcontractServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubSubcontractServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.project.service.impl; +package org.dromara.contractor.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -13,17 +13,17 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.project.domain.BusContractor; +import org.dromara.contractor.domain.SubContractor; +import org.dromara.contractor.domain.SubSubcontract; +import org.dromara.contractor.domain.dto.subcontract.SubSubcontractCreateReq; +import org.dromara.contractor.domain.dto.subcontract.SubSubcontractQueryReq; +import org.dromara.contractor.domain.dto.subcontract.SubSubcontractUpdateReq; +import org.dromara.contractor.domain.vo.subcontract.SubSubcontractVo; +import org.dromara.contractor.mapper.SubSubcontractMapper; +import org.dromara.contractor.service.ISubContractorService; +import org.dromara.contractor.service.ISubSubcontractService; import org.dromara.project.domain.BusProject; -import org.dromara.project.domain.BusSubcontract; -import org.dromara.project.domain.dto.subcontract.BusSubcontractCreateReq; -import org.dromara.project.domain.dto.subcontract.BusSubcontractQueryReq; -import org.dromara.project.domain.dto.subcontract.BusSubcontractUpdateReq; -import org.dromara.project.domain.vo.subcontract.BusSubcontractVo; -import org.dromara.project.mapper.BusSubcontractMapper; -import org.dromara.project.service.IBusContractorService; import org.dromara.project.service.IBusProjectService; -import org.dromara.project.service.IBusSubcontractService; import org.dromara.system.service.ISysOssService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -43,14 +43,14 @@ import java.util.stream.Collectors; */ @Slf4j @Service -public class BusSubcontractServiceImpl extends ServiceImpl - implements IBusSubcontractService { +public class SubSubcontractServiceImpl extends ServiceImpl + implements ISubSubcontractService { @Resource private IBusProjectService projectService; @Resource - private IBusContractorService contractorService; + private ISubContractorService contractorService; @Resource private ISysOssService ossService; @@ -62,8 +62,8 @@ public class BusSubcontractServiceImpl extends ServiceImpl queryPageList(BusSubcontractQueryReq req, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(req); - Page result = this.page(pageQuery.build(), lqw); + public TableDataInfo queryPageList(SubSubcontractQueryReq req, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(req); + Page result = this.page(pageQuery.build(), lqw); return TableDataInfo.build(this.getVoPage(result)); } @@ -91,8 +91,8 @@ public class BusSubcontractServiceImpl extends ServiceImpl queryList(BusSubcontractQueryReq req) { - LambdaQueryWrapper lqw = buildQueryWrapper(req); + public List queryList(SubSubcontractQueryReq req) { + LambdaQueryWrapper lqw = buildQueryWrapper(req); return this.list(lqw).stream().map(this::getVo).toList(); } @@ -103,14 +103,14 @@ public class BusSubcontractServiceImpl extends ServiceImpl 0) { throw new ServiceException("已关联该项目合同", HttpStatus.BAD_REQUEST); @@ -129,19 +129,19 @@ public class BusSubcontractServiceImpl extends ServiceImpl 0) { throw new ServiceException("已关联该项目合同", HttpStatus.BAD_REQUEST); @@ -156,7 +156,7 @@ public class BusSubcontractServiceImpl extends ServiceImpl ids, Boolean isValid) { Long userId = LoginHelper.getUserId(); - List list = this.listByIds(ids); + List list = this.listByIds(ids); if (isValid) { - List projectIdList = list.stream().map(BusSubcontract::getProjectId).toList(); + List projectIdList = list.stream().map(SubSubcontract::getProjectId).toList(); projectService.validAuth(projectIdList, userId); } // 关联删除文件 - Set fileIdList = list.stream().map(BusSubcontract::getContractFileId).collect(Collectors.toSet()); + Set fileIdList = list.stream().map(SubSubcontract::getContractFileId).collect(Collectors.toSet()); Boolean result = ossService.deleteWithValidByIds(fileIdList, false); if (!result) { log.error("删除文件：{}失败", fileIdList); @@ -210,9 +210,9 @@ public class BusSubcontractServiceImpl extends ServiceImpl buildQueryWrapper(BusSubcontractQueryReq req) { - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + public LambdaQueryWrapper buildQueryWrapper(SubSubcontractQueryReq req) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); Long projectId = req.getProjectId(); Long contractorId = req.getContractorId(); String contractNumber = req.getContractNumber(); String contractName = req.getContractName(); String contractType = req.getContractType(); - lqw.like(StringUtils.isNotBlank(contractNumber), BusSubcontract::getContractNumber, contractNumber); - lqw.like(StringUtils.isNotBlank(contractName), BusSubcontract::getContractName, contractName); - lqw.eq(ObjectUtils.isNotEmpty(projectId), BusSubcontract::getProjectId, projectId); - lqw.eq(ObjectUtils.isNotEmpty(contractorId), BusSubcontract::getContractorId, contractorId); - lqw.eq(StringUtils.isNotBlank(contractType), BusSubcontract::getContractType, contractType); + lqw.like(StringUtils.isNotBlank(contractNumber), SubSubcontract::getContractNumber, contractNumber); + lqw.like(StringUtils.isNotBlank(contractName), SubSubcontract::getContractName, contractName); + lqw.eq(ObjectUtils.isNotEmpty(projectId), SubSubcontract::getProjectId, projectId); + lqw.eq(ObjectUtils.isNotEmpty(contractorId), SubSubcontract::getContractorId, contractorId); + lqw.eq(StringUtils.isNotBlank(contractType), SubSubcontract::getContractType, contractType); return lqw; } @@ -249,9 +249,9 @@ public class BusSubcontractServiceImpl extends ServiceImpl getVoPage(Page subcontractPage) { - List subcontractList = subcontractPage.getRecords(); - Page subcontractVoPage = new Page<>( + public Page getVoPage(Page subcontractPage) { + List subcontractList = subcontractPage.getRecords(); + Page subcontractVoPage = new Page<>( subcontractPage.getCurrent(), subcontractPage.getSize(), subcontractPage.getTotal() @@ -260,15 +260,15 @@ public class BusSubcontractServiceImpl extends ServiceImpl contractorIdList = subcontractList.stream().map(BusSubcontract::getContractorId).collect(Collectors.toSet()); - Map contractorMap = contractorService.listByIds(contractorIdList) - .stream().collect(Collectors.toMap(BusContractor::getId, v -> v)); - List subcontractVoList = subcontractList.stream().map(entity -> { - BusSubcontractVo subcontractVo = new BusSubcontractVo(); + Set contractorIdList = subcontractList.stream().map(SubSubcontract::getContractorId).collect(Collectors.toSet()); + Map contractorMap = contractorService.listByIds(contractorIdList) + .stream().collect(Collectors.toMap(SubContractor::getId, v -> v)); + List subcontractVoList = subcontractList.stream().map(entity -> { + SubSubcontractVo subcontractVo = new SubSubcontractVo(); BeanUtils.copyProperties(entity, subcontractVo); Long contractorId = entity.getContractorId(); if (contractorMap.containsKey(contractorId)) { - BusContractor contractor = contractorMap.get(contractorId); + SubContractor contractor = contractorMap.get(contractorId); subcontractVo.setContractorName(contractor.getName()); } return subcontractVo; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/manager/changxiemanager/ChangxieController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/manager/changxiemanager/ChangxieController.java new file mode 100644 index 00000000..6d902ea8 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/manager/changxiemanager/ChangxieController.java @@ -0,0 +1,53 @@ +package org.dromara.manager.changxiemanager; + +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.io.*; +import java.net.HttpURLConnection; +import java.net.URI; +import java.net.URL; +import java.util.Scanner; + +/** + * @author lcj + * @date 2025/6/27 17:02 + */ +@RestController +@RequestMapping("/changxie") +public class ChangxieController { + + @PostMapping("/callback") + public void singleFileUploads(HttpServletRequest request, HttpServletResponse response) throws IOException { + PrintWriter writer = response.getWriter(); + Scanner scanner = new Scanner(request.getInputStream(), "GBK").useDelimiter("\\A"); + String body = scanner.hasNext() ? scanner.next() : ""; + JSONObject jsonObj = JSONUtil.parseObj(body); + if ((long) jsonObj.get("status") == 2 || (long) jsonObj.get("status") == 6) { + String downloadUri = (String) jsonObj.get("url"); + URI uri = URI.create(downloadUri); + URL url = uri.toURL(); + HttpURLConnection connection = (HttpURLConnection) url.openConnection(); + InputStream stream = connection.getInputStream(); + File savedFile = new File("file/resource/changxie"); + try (FileOutputStream out = new FileOutputStream(savedFile)) { + int read; + final byte[] bytes = new byte[1024]; + while ((read = stream.read(bytes)) != -1) { + out.write(bytes, 0, read); + } + out.flush(); + } + connection.disconnect(); + } else if ((long) jsonObj.get("status") == 3 || (long) jsonObj.get("status") == 7) { + writer.write("{\"error\":-1}"); + } + writer.write("{\"error\":0}"); + } +} + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusConstructionUserFileMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusConstructionUserFileMapper.java deleted file mode 100644 index 1da5002c..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusConstructionUserFileMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.project.mapper; - -import org.dromara.project.domain.BusConstructionUserFile; -import org.dromara.project.domain.vo.constructionuserfile.BusConstructionUserFileVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 施工人员文件存储Mapper接口 - * - * @author lcj - * @date 2025-04-01 - */ -public interface BusConstructionUserFileMapper extends BaseMapperPlus { - -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusConstructionUserMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusConstructionUserMapper.java deleted file mode 100644 index 94f7230c..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusConstructionUserMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.project.mapper; - -import org.dromara.project.domain.BusConstructionUser; -import org.dromara.project.domain.vo.constructionuser.BusConstructionUserVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 施工人员Mapper接口 - * - * @author lcj - * @date 2025-03-07 - */ -public interface BusConstructionUserMapper extends BaseMapperPlus { - -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusContractorMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusContractorMapper.java deleted file mode 100644 index 423f081e..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusContractorMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.project.mapper; - -import org.dromara.project.domain.BusContractor; -import org.dromara.project.domain.vo.contractor.BusContractorVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 分包单位Mapper接口 - * - * @author lcj - * @date 2025-03-07 - */ -public interface BusContractorMapper extends BaseMapperPlus { - -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusContractorToolMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusContractorToolMapper.java deleted file mode 100644 index d2225ca4..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusContractorToolMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.project.mapper; - -import org.dromara.project.domain.BusContractorTool; -import org.dromara.project.domain.vo.contractortool.BusContractorToolVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 分包方工器具Mapper接口 - * - * @author lcj - * @date 2025-06-26 - */ -public interface BusContractorToolMapper extends BaseMapperPlus { - -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusSubcontractMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusSubcontractMapper.java deleted file mode 100644 index 8ceda5a6..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusSubcontractMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.project.mapper; - -import org.dromara.project.domain.BusSubcontract; -import org.dromara.project.domain.vo.subcontract.BusSubcontractVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 分包合同Mapper接口 - * - * @author lcj - * @date 2025-06-25 - */ -public interface BusSubcontractMapper extends BaseMapperPlus { - -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java index e72b8d19..879a9601 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java @@ -15,8 +15,9 @@ import org.dromara.common.core.utils.ObjectUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.contractor.domain.SubConstructionUser; +import org.dromara.contractor.service.ISubConstructionUserService; import org.dromara.project.domain.BusAttendance; -import org.dromara.project.domain.BusConstructionUser; import org.dromara.project.domain.BusProjectTeamMember; import org.dromara.project.domain.enums.BusAttendanceClockStatusEnum; import org.dromara.project.domain.enums.BusAttendanceCommuterEnum; @@ -56,7 +57,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl blackList = constructionBlacklistService.queryIdListByProjectId(projectId); // 构建查询用户相关信息查询条件 List userIdList = constructionUserService.lambdaQuery() - .eq(BusConstructionUser::getProjectId, projectId) - .eq(req.getTeamId() != null, BusConstructionUser::getTeamId, req.getTeamId()) - .eq(req.getTypeOfWork() != null, BusConstructionUser::getTypeOfWork, req.getTypeOfWork()) - .notIn(CollUtil.isNotEmpty(blackList), BusConstructionUser::getId, blackList) - .list().stream().map(BusConstructionUser::getId).toList(); + .eq(SubConstructionUser::getProjectId, projectId) + .eq(req.getTeamId() != null, SubConstructionUser::getTeamId, req.getTeamId()) + .eq(req.getTypeOfWork() != null, SubConstructionUser::getTypeOfWork, req.getTypeOfWork()) + .notIn(CollUtil.isNotEmpty(blackList), SubConstructionUser::getId, blackList) + .list().stream().map(SubConstructionUser::getId).toList(); lqw.in(CollUtil.isNotEmpty(userIdList), BusAttendance::getUserId, userIdList); Map> dateListMap = this.list(lqw) .stream().collect(Collectors.groupingBy(BusAttendance::getClockDate)); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionBlacklistServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionBlacklistServiceImpl.java index 10cb3891..6a52d827 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionBlacklistServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionBlacklistServiceImpl.java @@ -15,14 +15,14 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.project.domain.BusConstructionBlacklist; -import org.dromara.project.domain.BusConstructionUser; +import org.dromara.contractor.domain.SubConstructionUser; import org.dromara.project.domain.BusProjectTeamMember; import org.dromara.project.domain.dto.constructionblacklist.BusConstructionBlacklistCreateReq; import org.dromara.project.domain.dto.constructionblacklist.BusConstructionBlacklistQueryReq; import org.dromara.project.domain.vo.constructionblacklist.BusConstructionBlacklistVo; import org.dromara.project.mapper.BusConstructionBlacklistMapper; import org.dromara.project.service.IBusConstructionBlacklistService; -import org.dromara.project.service.IBusConstructionUserService; +import org.dromara.contractor.service.ISubConstructionUserService; import org.dromara.project.service.IBusProjectService; import org.dromara.project.service.IBusProjectTeamMemberService; import org.dromara.common.utils.IdCardEncryptorUtil; @@ -48,7 +48,7 @@ public class BusConstructionBlacklistServiceImpl extends ServiceImpl projectIdList = userProjectRelevancyService.listObjs(userProjectRelevancyLqw, obj -> (Long) obj); List projectList = this.listByIds(projectIdList); // 获取项目列表下的分包公司列表 - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); - lqw.in(BusContractor::getProjectId, projectIdList); - Map> projectIdContractorList = contractorService.list(lqw).stream() - .collect(Collectors.groupingBy(BusContractor::getProjectId)); + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.in(SubContractor::getProjectId, projectIdList); + Map> projectIdContractorList = contractorService.list(lqw).stream() + .collect(Collectors.groupingBy(SubContractor::getProjectId)); // 获取封装 return projectList.stream().map(project -> { BusProjectContractorListVo projectContractorListResp = new BusProjectContractorListVo(); @@ -281,7 +281,7 @@ public class BusProjectServiceImpl extends ServiceImpl contractorList = projectIdContractorList.get(project.getId()); + List contractorList = projectIdContractorList.get(project.getId()); if (CollUtil.isEmpty(contractorList)) { throw new ServiceException("项目：" + project.getProjectName() + "下无分包单位，请创建后再进行操作", HttpStatus.BAD_REQUEST); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java index 42bd59bd..fb818ca4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java @@ -15,7 +15,8 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.project.domain.BusConstructionUser; +import org.dromara.contractor.domain.SubConstructionUser; +import org.dromara.contractor.service.ISubConstructionUserService; import org.dromara.project.domain.BusConstructionUserExit; import org.dromara.project.domain.BusProjectTeam; import org.dromara.project.domain.BusProjectTeamMember; @@ -48,7 +49,7 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl constructionUserLuw = Wrappers.lambdaUpdate(BusConstructionUser.class) - .eq(BusConstructionUser::getId, projectTeamMember.getMemberId()) - .set(BusConstructionUser::getTeamId, projectTeamMember.getTeamId()) - .set(BusConstructionUser::getTeamName, projectTeam.getTeamName()) - .set(BusConstructionUser::getEntryDate, new Date()) - .set(BusConstructionUser::getLeaveDate, null); + LambdaUpdateWrapper constructionUserLuw = Wrappers.lambdaUpdate(SubConstructionUser.class) + .eq(SubConstructionUser::getId, projectTeamMember.getMemberId()) + .set(SubConstructionUser::getTeamId, projectTeamMember.getTeamId()) + .set(SubConstructionUser::getTeamName, projectTeam.getTeamName()) + .set(SubConstructionUser::getEntryDate, new Date()) + .set(SubConstructionUser::getLeaveDate, null); constructionUserService.update(constructionUserLuw); return projectTeamMember.getId(); } @@ -176,10 +177,10 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl constructionUserLuw = Wrappers.lambdaUpdate(BusConstructionUser.class) - .eq(BusConstructionUser::getId, projectTeamMember.getMemberId()) - .set(BusConstructionUser::getTeamId, projectTeamMember.getTeamId()) - .set(BusConstructionUser::getTeamName, projectTeam.getTeamName()); + LambdaUpdateWrapper constructionUserLuw = Wrappers.lambdaUpdate(SubConstructionUser.class) + .eq(SubConstructionUser::getId, projectTeamMember.getMemberId()) + .set(SubConstructionUser::getTeamId, projectTeamMember.getTeamId()) + .set(SubConstructionUser::getTeamName, projectTeam.getTeamName()); constructionUserService.update(constructionUserLuw); } // 操作数据库 @@ -240,7 +241,7 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl constructionUserLuw = Wrappers.lambdaUpdate(BusConstructionUser.class) - .eq(BusConstructionUser::getId, projectTeamMember.getMemberId()) - .set(BusConstructionUser::getTeamId, null) - .set(BusConstructionUser::getLeaveDate, new Date()); + LambdaUpdateWrapper constructionUserLuw = Wrappers.lambdaUpdate(SubConstructionUser.class) + .eq(SubConstructionUser::getId, projectTeamMember.getMemberId()) + .set(SubConstructionUser::getTeamId, null) + .set(SubConstructionUser::getLeaveDate, new Date()); constructionUserService.update(constructionUserLuw); return true; } @@ -276,7 +277,7 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl constructionUserQueryWrapper = new QueryWrapper<>(); + QueryWrapper constructionUserQueryWrapper = new QueryWrapper<>(); constructionUserQueryWrapper.select("id"); constructionUserQueryWrapper.like("user_name", memberName); List constructionUserIdList = constructionUserService.listObjs(constructionUserQueryWrapper, obj -> (Long) obj); @@ -339,8 +340,8 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl teamMemberIdSet = projectTeamMemberList.stream().map(BusProjectTeamMember::getMemberId) .collect(Collectors.toSet()); - Map> contractorIdContractorList = constructionUserService.listByIds(teamMemberIdSet).stream() - .collect(Collectors.groupingBy(BusConstructionUser::getId)); + Map> contractorIdContractorList = constructionUserService.listByIds(teamMemberIdSet).stream() + .collect(Collectors.groupingBy(SubConstructionUser::getId)); // 填充信息 List projectTeamMemberVoList = projectTeamMemberList.stream().map(projectTeamMember -> { BusProjectTeamMemberVo projectTeamMemberVo = new BusProjectTeamMemberVo(); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java index 2bde18d1..57350bff 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java @@ -14,7 +14,7 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.project.domain.BusConstructionUser; +import org.dromara.contractor.domain.SubConstructionUser; import org.dromara.project.domain.BusProjectTeam; import org.dromara.project.domain.BusProjectTeamMember; import org.dromara.project.domain.enums.BusProjectTeamMemberPostEnum; @@ -25,7 +25,7 @@ import org.dromara.project.domain.vo.projectteam.BusForemanVo; import org.dromara.project.domain.vo.projectteam.BusProjectTeamForemanVo; import org.dromara.project.domain.vo.projectteam.BusProjectTeamVo; import org.dromara.project.mapper.BusProjectTeamMapper; -import org.dromara.project.service.IBusConstructionUserService; +import org.dromara.contractor.service.ISubConstructionUserService; import org.dromara.project.service.IBusProjectService; import org.dromara.project.service.IBusProjectTeamMemberService; import org.dromara.project.service.IBusProjectTeamService; @@ -59,7 +59,7 @@ public class BusProjectTeamServiceImpl extends ServiceImpl> foremanMap = constructionUserService.listByIds(foremanIdList).stream() - .collect(Collectors.groupingBy(BusConstructionUser::getTeamId)); + Map> foremanMap = constructionUserService.listByIds(foremanIdList).stream() + .collect(Collectors.groupingBy(SubConstructionUser::getTeamId)); // 封装数据 return projectTeamList.stream().map(projectTeam -> { BusProjectTeamForemanVo projectTeamForemanResp = new BusProjectTeamForemanVo(); @@ -235,7 +235,7 @@ public class BusProjectTeamServiceImpl extends ServiceImpl constructionUserList = foremanMap.get(projectTeam.getId()); + List constructionUserList = foremanMap.get(projectTeam.getId()); List foremanVoList = constructionUserList.stream() .map(constructionUser -> new BusForemanVo(constructionUser.getId(), constructionUser.getUserName())) .toList(); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltKnowledgeDocumentController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltKnowledgeDocumentController.java index 4af38e0c..d026fcb1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltKnowledgeDocumentController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltKnowledgeDocumentController.java @@ -3,7 +3,6 @@ package org.dromara.quality.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.lang.tree.Tree; import jakarta.annotation.Resource; -import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import org.dromara.common.core.domain.R; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -38,19 +37,29 @@ public class QltKnowledgeDocumentController extends BaseController { @Resource private IQltKnowledgeDocumentService qltKnowledgeDocumentService; + /** + * 分页查询质量知识库文件列表 + */ + @SaCheckPermission("quality:knowledgeDocument:list") + @GetMapping("/file/page") + public TableDataInfo queryFilePageList(QltKnowledgeDocumentFileQueryReq req, PageQuery pageQuery) { + return qltKnowledgeDocumentService.queryFilePageByFolderId(req, pageQuery); + } + /** * 查询质量知识库文件列表 */ - @SaCheckPermission("safety:knowledgeDocument:list") - @GetMapping("/file/list") - public TableDataInfo queryFilePageList(QltKnowledgeDocumentFileQueryReq req, PageQuery pageQuery) { - return qltKnowledgeDocumentService.queryFileListByFolderId(req, pageQuery); + @SaCheckPermission("quality:knowledgeDocument:list") + @GetMapping("/file/list/{folderId}") + public R> queryFileListByFolderId(@NotNull(message = "主键不能为空") + @PathVariable Long folderId) { + return R.ok(qltKnowledgeDocumentService.queryFileListByFolderId(folderId)); } /** * 查询质量知识库文件树列表 */ - @SaCheckPermission("safety:knowledgeDocument:list") + @SaCheckPermission("quality:knowledgeDocument:list") @GetMapping("/folder/tree/list") public R>> queryFolderTreeList(QltKnowledgeDocumentQueryReq req) { List> list = qltKnowledgeDocumentService.queryFolderTreeList(req); @@ -60,7 +69,7 @@ public class QltKnowledgeDocumentController extends BaseController { /** * 查询质量知识库回收站文件列表 */ - @SaCheckPermission("safety:knowledgeDocument:list") + @SaCheckPermission("quality:knowledgeDocument:list") @GetMapping("/recycleBin/list") public TableDataInfo queryRecycleBinPageList(QltKnowledgeDocumentQueryReq req, PageQuery pageQuery) { return qltKnowledgeDocumentService.queryRecycleBinPageList(req, pageQuery); @@ -71,7 +80,7 @@ public class QltKnowledgeDocumentController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("safety:knowledgeDocument:query") + @SaCheckPermission("quality:knowledgeDocument:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { @@ -81,7 +90,7 @@ public class QltKnowledgeDocumentController extends BaseController { /** * 新增质量知识库文件 */ - @SaCheckPermission("safety:knowledgeDocument:add") + @SaCheckPermission("quality:knowledgeDocument:add") @Log(title = "质量知识库", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/file") @@ -92,7 +101,7 @@ public class QltKnowledgeDocumentController extends BaseController { /** * 修改质量知识库 */ - @SaCheckPermission("safety:knowledgeDocument:edit") + @SaCheckPermission("quality:knowledgeDocument:edit") @Log(title = "质量知识库", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/file") @@ -105,7 +114,7 @@ public class QltKnowledgeDocumentController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("safety:knowledgeDocument:remove") + @SaCheckPermission("quality:knowledgeDocument:remove") @Log(title = "质量知识库", businessType = BusinessType.DELETE) @DeleteMapping("/file/{id}") public R remove(@NotNull(message = "主键不能为空") @@ -113,10 +122,23 @@ public class QltKnowledgeDocumentController extends BaseController { return toAjax(qltKnowledgeDocumentService.deleteFileById(id)); } + /** + * 批量删除质量知识库回收站文件信息 + * + * @param ids 主键串 + */ + @SaCheckPermission("quality:knowledgeDocument:remove") + @Log(title = "质量知识库", businessType = BusinessType.DELETE) + @DeleteMapping("/file/recycleBin/{ids}") + public R removeRecycleBin(@NotNull(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(qltKnowledgeDocumentService.deleteRecycleBinFileBatchByIds(List.of(ids))); + } + /** * 根据主键id批量恢复 */ - @SaCheckPermission("safety:knowledgeDocument:recovery") + @SaCheckPermission("quality:knowledgeDocument:recovery") @Log(title = "质量知识库", businessType = BusinessType.UPDATE) @PostMapping("/recovery/{ids}") public R recoveryBatchById(@NotNull(message = "主键不能为空") diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/knowledgedocument/QltKnowledgeDocumentFileQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/knowledgedocument/QltKnowledgeDocumentFileQueryReq.java index 251e819b..c3d79fc4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/knowledgedocument/QltKnowledgeDocumentFileQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/knowledgedocument/QltKnowledgeDocumentFileQueryReq.java @@ -15,6 +15,11 @@ public class QltKnowledgeDocumentFileQueryReq implements Serializable { @Serial private static final long serialVersionUID = 3877587395295861071L; + /** + * 项目id + */ + private Long projectId; + /** * 文件夹id */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/IQltKnowledgeDocumentService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/IQltKnowledgeDocumentService.java index ca679a86..b1271020 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/IQltKnowledgeDocumentService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/IQltKnowledgeDocumentService.java @@ -41,13 +41,21 @@ public interface IQltKnowledgeDocumentService extends IService> queryFolderTreeList(QltKnowledgeDocumentQueryReq req); /** - * 查询文件夹下的质量知识库文件列表 + * 分页查询文件夹下的质量知识库文件列表 * * @param req 查询参数 * @param pageQuery 分页参数 * @return 质量知识库文件列表 */ - TableDataInfo queryFileListByFolderId(QltKnowledgeDocumentFileQueryReq req, PageQuery pageQuery); + TableDataInfo queryFilePageByFolderId(QltKnowledgeDocumentFileQueryReq req, PageQuery pageQuery); + + /** + * 查询文件夹下的质量知识库文件列表 + * + * @param folderId 文件夹id + * @return 质量知识库文件列表 + */ + List queryFileListByFolderId(Long folderId); /** * 查询回收站中的文件 @@ -91,6 +99,14 @@ public interface IQltKnowledgeDocumentService extends IService ids); + /** * 批量恢复质量会议纪要信息 * diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltKnowledgeDocumentServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltKnowledgeDocumentServiceImpl.java index c1e91116..524f472f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltKnowledgeDocumentServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltKnowledgeDocumentServiceImpl.java @@ -16,6 +16,7 @@ import org.dromara.common.enums.DocumentStatusEnum; import org.dromara.common.enums.DocumentTypeEnum; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.project.service.IBusProjectService; import org.dromara.quality.constant.QltKnowledgeDocumentConstant; import org.dromara.quality.domain.QltKnowledgeDocument; @@ -92,22 +93,48 @@ public class QltKnowledgeDocumentServiceImpl extends ServiceImpl queryFileListByFolderId(QltKnowledgeDocumentFileQueryReq req, PageQuery pageQuery) { - QltKnowledgeDocument folder = this.getById(req.getFolderId()); + public TableDataInfo queryFilePageByFolderId(QltKnowledgeDocumentFileQueryReq req, PageQuery pageQuery) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + Long folderId = req.getFolderId(); + if (folderId != null) { + QltKnowledgeDocument folder = this.getById(folderId); + if (folder == null) { + throw new ServiceException("文件夹不存在", HttpStatus.NOT_FOUND); + } + if (!DocumentTypeEnum.FOLDER.getValue().equals(folder.getFileType())) { + throw new ServiceException("所选目录不是文件夹", HttpStatus.BAD_REQUEST); + } + lqw.eq(QltKnowledgeDocument::getPid, folderId); + } + lqw.eq(ObjectUtils.isNotEmpty(req.getProjectId()), QltKnowledgeDocument::getProjectId, req.getProjectId()); + lqw.ne(QltKnowledgeDocument::getFileType, DocumentTypeEnum.FOLDER.getValue()); + lqw.eq(QltKnowledgeDocument::getFileStatus, DocumentStatusEnum.NORMAL.getValue()); + lqw.like(StringUtils.isNotBlank(req.getFileName()), QltKnowledgeDocument::getFileName, req.getFileName()); + Page documentPage = this.page(pageQuery.build(), lqw); + return TableDataInfo.build(this.getVoPage(documentPage)); + } + + /** + * 查询文件夹下的质量知识库文件列表 + * + * @param folderId 文件夹id + * @return 质量知识库文件列表 + */ + @Override + public List queryFileListByFolderId(Long folderId) { + QltKnowledgeDocument folder = this.getById(folderId); if (folder == null) { throw new ServiceException("文件夹不存在", HttpStatus.NOT_FOUND); } if (!DocumentTypeEnum.FOLDER.getValue().equals(folder.getFileType())) { throw new ServiceException("所选目录不是文件夹", HttpStatus.BAD_REQUEST); } - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); - lqw.eq(QltKnowledgeDocument::getPid, folder.getId()); - lqw.eq(QltKnowledgeDocument::getProjectId, folder.getProjectId()); - lqw.ne(QltKnowledgeDocument::getFileType, DocumentTypeEnum.FOLDER.getValue()); - lqw.eq(QltKnowledgeDocument::getFileStatus, DocumentStatusEnum.NORMAL.getValue()); - lqw.like(StringUtils.isNotBlank(req.getFileName()), QltKnowledgeDocument::getFileName, req.getFileName()); - Page documentPage = this.page(pageQuery.build(), lqw); - return TableDataInfo.build(this.getVoPage(documentPage)); + List list = this.lambdaQuery() + .eq(QltKnowledgeDocument::getPid, folderId) + .ne(QltKnowledgeDocument::getFileType, DocumentTypeEnum.FOLDER.getValue()) + .eq(QltKnowledgeDocument::getFileStatus, DocumentStatusEnum.NORMAL.getValue()) + .list(); + return list.stream().map(this::getVo).toList(); } /** @@ -179,7 +206,7 @@ public class QltKnowledgeDocumentServiceImpl extends ServiceImpl ids) { + Long userId = LoginHelper.getUserId(); + List documentList = this.listByIds(ids); + if (CollUtil.isEmpty(documentList)) { + throw new ServiceException("文件不存在", HttpStatus.ERROR); + } + Set projectIdList = documentList.stream().map(QltKnowledgeDocument::getProjectId).collect(Collectors.toSet()); + projectService.validAuth(projectIdList, userId); + boolean result = this.removeBatchByIds(ids); + if (!result) { + throw new ServiceException("文件删除失败", HttpStatus.ERROR); + } + return true; + } + /** * 批量恢复质量会议纪要信息 * diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java index b98b1895..ec402be0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java @@ -21,9 +21,9 @@ import org.dromara.common.oss.core.OssClient; import org.dromara.common.oss.exception.OssException; import org.dromara.common.oss.factory.OssFactory; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.project.domain.BusConstructionUser; +import org.dromara.contractor.domain.SubConstructionUser; import org.dromara.project.domain.BusProject; -import org.dromara.project.service.IBusConstructionUserService; +import org.dromara.contractor.service.ISubConstructionUserService; import org.dromara.project.service.IBusProjectService; import org.dromara.quality.constant.QltQualityConstant; import org.dromara.quality.domain.QltQualityInspection; @@ -82,7 +82,7 @@ public class QltQualityInspectionServiceImpl extends ServiceImpl correctorList = qualityInspectionList.stream().map(QltQualityInspection::getCorrector).distinct().toList(); Map correctorMap = constructionUserService.listByIds(correctorList) - .stream().collect(Collectors.toMap(BusConstructionUser::getId, BusConstructionUser::getUserName)); + .stream().collect(Collectors.toMap(SubConstructionUser::getId, SubConstructionUser::getUserName)); // 获取创建用户信息 List createByList = qualityInspectionList.stream().map(QltQualityInspection::getCreateBy).distinct().toList(); List userVoList = userService.selectUserByIds(createByList, null); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseKnowledgeDocumentController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseKnowledgeDocumentController.java index eaded126..b4b745f1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseKnowledgeDocumentController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseKnowledgeDocumentController.java @@ -37,13 +37,23 @@ public class HseKnowledgeDocumentController extends BaseController { @Resource private IHseKnowledgeDocumentService hseKnowledgeDocumentService; + /** + * 分页查询安全知识库文件列表 + */ + @SaCheckPermission("safety:knowledgeDocument:list") + @GetMapping("/file/page") + public TableDataInfo queryFilePageList(HseKnowledgeDocumentFileQueryReq req, PageQuery pageQuery) { + return hseKnowledgeDocumentService.queryFilePageByFolderId(req, pageQuery); + } + /** * 查询安全知识库文件列表 */ @SaCheckPermission("safety:knowledgeDocument:list") - @GetMapping("/file/list") - public TableDataInfo queryFilePageList(HseKnowledgeDocumentFileQueryReq req, PageQuery pageQuery) { - return hseKnowledgeDocumentService.queryFileListByFolderId(req, pageQuery); + @GetMapping("/file/list/{folderId}") + public R> queryFileListByFolderId(@NotNull(message = "主键不能为空") + @PathVariable Long folderId) { + return R.ok(hseKnowledgeDocumentService.queryFileListByFolderId(folderId)); } /** @@ -112,6 +122,19 @@ public class HseKnowledgeDocumentController extends BaseController { return toAjax(hseKnowledgeDocumentService.deleteFileById(id)); } + /** + * 批量删除安全知识库回收站文件信息 + * + * @param ids 主键串 + */ + @SaCheckPermission("safety:knowledgeDocument:remove") + @Log(title = "安全知识库", businessType = BusinessType.DELETE) + @DeleteMapping("/file/recycleBin/{ids}") + public R removeRecycleBin(@NotNull(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(hseKnowledgeDocumentService.deleteRecycleBinFileBatchByIds(List.of(ids))); + } + /** * 根据主键id批量恢复 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/knowledgedocument/HseKnowledgeDocumentFileQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/knowledgedocument/HseKnowledgeDocumentFileQueryReq.java index 59585ae5..ddf157a2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/knowledgedocument/HseKnowledgeDocumentFileQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/knowledgedocument/HseKnowledgeDocumentFileQueryReq.java @@ -15,7 +15,18 @@ public class HseKnowledgeDocumentFileQueryReq implements Serializable { @Serial private static final long serialVersionUID = -2641241219631684277L; + /** + * 项目id + */ + private Long projectId; + + /** + * 文件夹id + */ private Long folderId; + /** + * 文件名 + */ private String fileName; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseKnowledgeDocumentService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseKnowledgeDocumentService.java index ea9c2f0f..7bf214bd 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseKnowledgeDocumentService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseKnowledgeDocumentService.java @@ -41,13 +41,21 @@ public interface IHseKnowledgeDocumentService extends IService> queryFolderTreeList(HseKnowledgeDocumentQueryReq req); /** - * 查询文件夹下的安全知识库文件列表 + * 查询文件夹下的安全知识库文件分页列表 * * @param req 查询参数 * @param pageQuery 分页参数 * @return 安全知识库文件列表 */ - TableDataInfo queryFileListByFolderId(HseKnowledgeDocumentFileQueryReq req, PageQuery pageQuery); + TableDataInfo queryFilePageByFolderId(HseKnowledgeDocumentFileQueryReq req, PageQuery pageQuery); + + /** + * 查询文件夹下的安全知识库文件列表 + * + * @param folderId 文件夹id + * @return 安全知识库文件列表 + */ + List queryFileListByFolderId(Long folderId); /** * 查询回收站中的文件 @@ -91,6 +99,14 @@ public interface IHseKnowledgeDocumentService extends IService ids); + /** * 批量恢复安全会议纪要信息 * diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseKnowledgeDocumentServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseKnowledgeDocumentServiceImpl.java index ff479f55..80017db2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseKnowledgeDocumentServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseKnowledgeDocumentServiceImpl.java @@ -12,8 +12,11 @@ import jakarta.annotation.Resource; import org.dromara.common.core.constant.HttpStatus; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.*; +import org.dromara.common.enums.DocumentStatusEnum; +import org.dromara.common.enums.DocumentTypeEnum; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.project.service.IBusProjectService; import org.dromara.safety.constant.HseKnowledgeDocumentConstant; import org.dromara.safety.domain.HseKnowledgeDocument; @@ -21,8 +24,6 @@ import org.dromara.safety.domain.dto.knowledgedocument.HseKnowledgeDocumentCreat import org.dromara.safety.domain.dto.knowledgedocument.HseKnowledgeDocumentFileQueryReq; import org.dromara.safety.domain.dto.knowledgedocument.HseKnowledgeDocumentQueryReq; import org.dromara.safety.domain.dto.knowledgedocument.HseKnowledgeDocumentUpdateFileReq; -import org.dromara.common.enums.DocumentStatusEnum; -import org.dromara.common.enums.DocumentTypeEnum; import org.dromara.safety.domain.vo.knowledgedocument.HseKnowledgeDocumentVo; import org.dromara.safety.mapper.HseKnowledgeDocumentMapper; import org.dromara.safety.service.IHseKnowledgeDocumentService; @@ -92,22 +93,48 @@ public class HseKnowledgeDocumentServiceImpl extends ServiceImpl queryFileListByFolderId(HseKnowledgeDocumentFileQueryReq req, PageQuery pageQuery) { - HseKnowledgeDocument folder = this.getById(req.getFolderId()); + public TableDataInfo queryFilePageByFolderId(HseKnowledgeDocumentFileQueryReq req, PageQuery pageQuery) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + Long folderId = req.getFolderId(); + if (folderId != null) { + HseKnowledgeDocument folder = this.getById(folderId); + if (folder == null) { + throw new ServiceException("文件夹不存在", HttpStatus.NOT_FOUND); + } + if (!DocumentTypeEnum.FOLDER.getValue().equals(folder.getFileType())) { + throw new ServiceException("所选目录不是文件夹", HttpStatus.BAD_REQUEST); + } + lqw.eq(HseKnowledgeDocument::getPid, folderId); + } + lqw.eq(ObjectUtils.isNotEmpty(req.getProjectId()), HseKnowledgeDocument::getProjectId, req.getProjectId()); + lqw.ne(HseKnowledgeDocument::getFileType, DocumentTypeEnum.FOLDER.getValue()); + lqw.eq(HseKnowledgeDocument::getFileStatus, DocumentStatusEnum.NORMAL.getValue()); + lqw.like(StringUtils.isNotBlank(req.getFileName()), HseKnowledgeDocument::getFileName, req.getFileName()); + Page documentPage = this.page(pageQuery.build(), lqw); + return TableDataInfo.build(this.getVoPage(documentPage)); + } + + /** + * 查询文件夹下的安全知识库文件列表 + * + * @param folderId 文件夹id + * @return 安全知识库文件列表 + */ + @Override + public List queryFileListByFolderId(Long folderId) { + HseKnowledgeDocument folder = this.getById(folderId); if (folder == null) { throw new ServiceException("文件夹不存在", HttpStatus.NOT_FOUND); } if (!DocumentTypeEnum.FOLDER.getValue().equals(folder.getFileType())) { throw new ServiceException("所选目录不是文件夹", HttpStatus.BAD_REQUEST); } - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); - lqw.eq(HseKnowledgeDocument::getPid, folder.getId()); - lqw.eq(HseKnowledgeDocument::getProjectId, folder.getProjectId()); - lqw.ne(HseKnowledgeDocument::getFileType, DocumentTypeEnum.FOLDER.getValue()); - lqw.eq(HseKnowledgeDocument::getFileStatus, DocumentStatusEnum.NORMAL.getValue()); - lqw.like(StringUtils.isNotBlank(req.getFileName()), HseKnowledgeDocument::getFileName, req.getFileName()); - Page documentPage = this.page(pageQuery.build(), lqw); - return TableDataInfo.build(this.getVoPage(documentPage)); + List list = this.lambdaQuery() + .eq(HseKnowledgeDocument::getPid, folderId) + .ne(HseKnowledgeDocument::getFileType, DocumentTypeEnum.FOLDER.getValue()) + .eq(HseKnowledgeDocument::getFileStatus, DocumentStatusEnum.NORMAL.getValue()) + .list(); + return list.stream().map(this::getVo).toList(); } /** @@ -178,7 +205,7 @@ public class HseKnowledgeDocumentServiceImpl extends ServiceImpl ids) { + Long userId = LoginHelper.getUserId(); + List documentList = this.listByIds(ids); + if (CollUtil.isEmpty(documentList)) { + throw new ServiceException("文件不存在", HttpStatus.ERROR); + } + Set projectIdList = documentList.stream().map(HseKnowledgeDocument::getProjectId).collect(Collectors.toSet()); + projectService.validAuth(projectIdList, userId); + boolean result = this.removeBatchByIds(ids); + if (!result) { + throw new ServiceException("文件删除失败", HttpStatus.ERROR); + } + return true; + } + /** * 批量恢复安全会议纪要信息 * diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionUserAnswerServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionUserAnswerServiceImpl.java index c1ba4c99..88f6dc27 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionUserAnswerServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionUserAnswerServiceImpl.java @@ -23,9 +23,9 @@ import org.dromara.common.oss.core.OssClient; import org.dromara.common.oss.exception.OssException; import org.dromara.common.oss.factory.OssFactory; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.project.domain.BusConstructionUser; +import org.dromara.contractor.domain.SubConstructionUser; import org.dromara.project.domain.BusProjectTeamMember; -import org.dromara.project.service.IBusConstructionUserService; +import org.dromara.contractor.service.ISubConstructionUserService; import org.dromara.project.service.IBusProjectService; import org.dromara.project.service.IBusProjectTeamMemberService; import org.dromara.safety.domain.HseQuestionUserAnswer; @@ -70,7 +70,7 @@ public class HseQuestionUserAnswerServiceImpl extends ServiceImpl idCardList = tempList.stream().map(HseQuestionUserAnswerUploadTemp::getUserIdCard) .collect(Collectors.toSet()); // 8.2 根据用户身份证列表查询用户信息 - Map> userIdMap = constructionUserService.lambdaQuery() - .in(BusConstructionUser::getSfzNumber, idCardList).list() - .stream().collect(Collectors.groupingBy(BusConstructionUser::getSfzNumber)); + Map> userIdMap = constructionUserService.lambdaQuery() + .in(SubConstructionUser::getSfzNumber, idCardList).list() + .stream().collect(Collectors.groupingBy(SubConstructionUser::getSfzNumber)); // 8.3 遍历临时对象，构造用户试卷存储对象 List questionUserAnswerList = tempList.stream().map(temp -> { HseQuestionUserAnswer questionUserAnswer = new HseQuestionUserAnswer(); @@ -265,7 +265,7 @@ public class HseQuestionUserAnswerServiceImpl extends ServiceImpl constructionUserList = constructionUserService.lambdaQuery() - .select(BusConstructionUser::getId) - .like(BusConstructionUser::getUserName, userName) + List constructionUserList = constructionUserService.lambdaQuery() + .select(SubConstructionUser::getId) + .like(SubConstructionUser::getUserName, userName) .list(); if (CollUtil.isNotEmpty(constructionUserList)) { - List userIdList = constructionUserList.stream().map(BusConstructionUser::getId).toList(); + List userIdList = constructionUserList.stream().map(SubConstructionUser::getId).toList(); lqw.in(HseQuestionUserAnswer::getUserId, userIdList); } else { lqw.eq(HseQuestionUserAnswer::getUserId, null); @@ -466,12 +466,12 @@ public class HseQuestionUserAnswerServiceImpl extends ServiceImpl userIdList = questionUserAnswerList.stream().map(HseQuestionUserAnswer::getUserId).collect(Collectors.toSet()); - List constructionUserList = constructionUserService.lambdaQuery() - .select(BusConstructionUser::getId, BusConstructionUser::getUserName) - .in(BusConstructionUser::getId, userIdList) + List constructionUserList = constructionUserService.lambdaQuery() + .select(SubConstructionUser::getId, SubConstructionUser::getUserName) + .in(SubConstructionUser::getId, userIdList) .list(); Map userNameMap = constructionUserList.stream() - .collect(Collectors.toMap(BusConstructionUser::getId, BusConstructionUser::getUserName)); + .collect(Collectors.toMap(SubConstructionUser::getId, SubConstructionUser::getUserName)); // 获取用户文件 Set fileIdList = questionUserAnswerList.stream().map(HseQuestionUserAnswer::getFile).filter(StringUtils::isNotBlank) .flatMap(fileId -> Arrays.stream(fileId.split(",")).map(Long::parseLong)).collect(Collectors.toSet()); @@ -536,10 +536,10 @@ public class HseQuestionUserAnswerServiceImpl extends ServiceImpl userIdSet = questionUserAnswerList.stream().map(HseQuestionUserAnswer::getUserId).collect(Collectors.toSet()); - Map> userMap = constructionUserService.lambdaQuery() - .select(BusConstructionUser::getId, BusConstructionUser::getUserName) - .in(BusConstructionUser::getId, userIdSet).list() - .stream().collect(Collectors.groupingBy(BusConstructionUser::getId)); + Map> userMap = constructionUserService.lambdaQuery() + .select(SubConstructionUser::getId, SubConstructionUser::getUserName) + .in(SubConstructionUser::getId, userIdSet).list() + .stream().collect(Collectors.groupingBy(SubConstructionUser::getId)); if (CollUtil.isEmpty(userMap)) { return; } @@ -553,7 +553,7 @@ public class HseQuestionUserAnswerServiceImpl extends ServiceImpl constructionUserLambdaQueryWrapper = Wrappers.lambdaQuery(BusConstructionUser.class) - .select(BusConstructionUser::getId, BusConstructionUser::getUserName) - .eq(BusConstructionUser::getId, correctorId); - BusConstructionUser constructionUser = constructionUserService.getOne(constructionUserLambdaQueryWrapper); + LambdaQueryWrapper constructionUserLambdaQueryWrapper = Wrappers.lambdaQuery(SubConstructionUser.class) + .select(SubConstructionUser::getId, SubConstructionUser::getUserName) + .eq(SubConstructionUser::getId, correctorId); + SubConstructionUser constructionUser = constructionUserService.getOne(constructionUserLambdaQueryWrapper); safetyInspectionVo.setCorrectorId(constructionUser.getId()); safetyInspectionVo.setCorrectorName(constructionUser.getUserName()); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseTeamMeetingServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseTeamMeetingServiceImpl.java index a6f3103d..253cdd3a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseTeamMeetingServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseTeamMeetingServiceImpl.java @@ -15,11 +15,11 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.project.domain.BusConstructionUser; -import org.dromara.project.domain.BusContractor; +import org.dromara.contractor.domain.SubConstructionUser; +import org.dromara.contractor.domain.SubContractor; +import org.dromara.contractor.service.ISubContractorService; import org.dromara.project.domain.BusProjectTeam; -import org.dromara.project.service.IBusConstructionUserService; -import org.dromara.project.service.IBusContractorService; +import org.dromara.contractor.service.ISubConstructionUserService; import org.dromara.project.service.IBusProjectService; import org.dromara.project.service.IBusProjectTeamService; import org.dromara.safety.domain.HseTeamMeeting; @@ -52,10 +52,10 @@ public class HseTeamMeetingServiceImpl extends ServiceImpl contractorLambdaQueryWrapper = Wrappers.lambdaQuery(BusContractor.class) - .select(BusContractor::getId, BusContractor::getName) - .eq(BusContractor::getId, contractorId); - BusContractor contractor = contractorService.getOne(contractorLambdaQueryWrapper); + LambdaQueryWrapper contractorLambdaQueryWrapper = Wrappers.lambdaQuery(SubContractor.class) + .select(SubContractor::getId, SubContractor::getName) + .eq(SubContractor::getId, contractorId); + SubContractor contractor = contractorService.getOne(contractorLambdaQueryWrapper); teamMeetingVo.setContractorName(contractor.getName()); } // 查询对应班组 @@ -229,10 +229,10 @@ public class HseTeamMeetingServiceImpl extends ServiceImpl participantIdList = JSONUtil.toList(participantId, Long.class); if (CollUtil.isNotEmpty(participantIdList)) { - LambdaQueryWrapper constructionUserLambdaQueryWrapper = Wrappers.lambdaQuery(BusConstructionUser.class) - .select(BusConstructionUser::getId, BusConstructionUser::getUserName) - .in(BusConstructionUser::getId, participantIdList); - List constructionUserList = constructionUserService.list(constructionUserLambdaQueryWrapper); + LambdaQueryWrapper constructionUserLambdaQueryWrapper = Wrappers.lambdaQuery(SubConstructionUser.class) + .select(SubConstructionUser::getId, SubConstructionUser::getUserName) + .in(SubConstructionUser::getId, participantIdList); + List constructionUserList = constructionUserService.list(constructionUserLambdaQueryWrapper); List idAndNameVOList = constructionUserList.stream() .map(constructionUser -> IdAndNameVO.build(constructionUser.getId(), constructionUser.getUserName())) .toList(); @@ -241,10 +241,10 @@ public class HseTeamMeetingServiceImpl extends ServiceImpl constructionUserLambdaQueryWrapper = Wrappers.lambdaQuery(BusConstructionUser.class) - .select(BusConstructionUser::getId, BusConstructionUser::getUserName) - .eq(BusConstructionUser::getId, compereId); - BusConstructionUser constructionUser = constructionUserService.getOne(constructionUserLambdaQueryWrapper); + LambdaQueryWrapper constructionUserLambdaQueryWrapper = Wrappers.lambdaQuery(SubConstructionUser.class) + .select(SubConstructionUser::getId, SubConstructionUser::getUserName) + .eq(SubConstructionUser::getId, compereId); + SubConstructionUser constructionUser = constructionUserService.getOne(constructionUserLambdaQueryWrapper); teamMeetingVo.setCompereName(constructionUser.getUserName()); } // 查询对应文件信息 @@ -319,8 +319,8 @@ public class HseTeamMeetingServiceImpl extends ServiceImpl contractorIdList = teamMeetingList.stream().map(HseTeamMeeting::getContractorId).collect(Collectors.toSet()); - Map> contractorMap = contractorService.listByIds(contractorIdList) - .stream().collect(Collectors.groupingBy(BusContractor::getId)); + Map> contractorMap = contractorService.listByIds(contractorIdList) + .stream().collect(Collectors.groupingBy(SubContractor::getId)); // 获取对应参会人 Set userIdList = new HashSet<>(); for (HseTeamMeeting teamMeeting : teamMeetingList) { @@ -330,8 +330,8 @@ public class HseTeamMeetingServiceImpl extends ServiceImpl compereIdList = teamMeetingList.stream().map(HseTeamMeeting::getCompereId).collect(Collectors.toSet()); userIdList.addAll(compereIdList); - Map> userMap = constructionUserService.listByIds(userIdList) - .stream().collect(Collectors.groupingBy(BusConstructionUser::getId)); + Map> userMap = constructionUserService.listByIds(userIdList) + .stream().collect(Collectors.groupingBy(SubConstructionUser::getId)); // 对象列表 => 封装对象列表 List teamMeetingVoList = teamMeetingList.stream().map(teamMeeting -> { HseTeamMeetingVo teamMeetingVo = new HseTeamMeetingVo(); @@ -339,19 +339,19 @@ public class HseTeamMeetingServiceImpl extends ServiceImpl - + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/project/BusConstructionUserMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/contractor/SubConstructionUserMapper.xml similarity index 67% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/project/BusConstructionUserMapper.xml rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/contractor/SubConstructionUserMapper.xml index eeadf38d..d530372d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/project/BusConstructionUserMapper.xml +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/contractor/SubConstructionUserMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/project/BusSubcontractMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/contractor/SubContractorMapper.xml similarity index 69% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/project/BusSubcontractMapper.xml rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/contractor/SubContractorMapper.xml index 85612a13..1fbee1ab 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/project/BusSubcontractMapper.xml +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/contractor/SubContractorMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/contractor/SubContractorMaterialMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/contractor/SubContractorMaterialMapper.xml new file mode 100644 index 00000000..13ad2b2c --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/contractor/SubContractorMaterialMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/contractor/SubContractorMaterialRecordMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/contractor/SubContractorMaterialRecordMapper.xml new file mode 100644 index 00000000..4d5add8e --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/contractor/SubContractorMaterialRecordMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/contractor/SubContractorToolMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/contractor/SubContractorToolMapper.xml new file mode 100644 index 00000000..76a5fcb5 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/contractor/SubContractorToolMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/project/BusContractorToolMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/contractor/SubSubcontractMapper.xml similarity index 73% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/project/BusContractorToolMapper.xml rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/contractor/SubSubcontractMapper.xml index 2de666d6..b9467844 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/project/BusContractorToolMapper.xml +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/contractor/SubSubcontractMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/project/BusContractorMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/project/BusContractorMapper.xml deleted file mode 100644 index 797205e3..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/project/BusContractorMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/xinnengyuan/script/sql/menuInitValue.sql b/xinnengyuan/script/sql/menuInitValue.sql index 156f3d2f..cb19e5f5 100644 --- a/xinnengyuan/script/sql/menuInitValue.sql +++ b/xinnengyuan/script/sql/menuInitValue.sql @@ -837,3 +837,23 @@ values(1938171656673443845, '分包方工器具进场删除', 193817165667344384 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) values(1938171656673443846, '分包方工器具进场导出', 1938171656673443841, '5', '#', '', 1, 0, 'F', '0', '0', 'contractor:contractorToolEntry:export', '#', 103, 1, sysdate(), null, null, ''); + +-- 菜单 SQL +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(1938446866786041857, '分包方物料', '1937684147828957185', '1', 'contractorMaterial', 'contractor/contractorMaterial/index', 1, 0, 'C', '0', '0', 'contractor:contractorMaterial:list', '#', 103, 1, sysdate(), null, null, '分包方物料菜单'); + +-- 按钮 SQL +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(1938446866786041858, '分包方物料查询', 1938446866786041857, '1', '#', '', 1, 0, 'F', '0', '0', 'contractor:contractorMaterial:query', '#', 103, 1, sysdate(), null, null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(1938446866786041859, '分包方物料新增', 1938446866786041857, '2', '#', '', 1, 0, 'F', '0', '0', 'contractor:contractorMaterial:add', '#', 103, 1, sysdate(), null, null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(1938446866786041860, '分包方物料修改', 1938446866786041857, '3', '#', '', 1, 0, 'F', '0', '0', 'contractor:contractorMaterial:edit', '#', 103, 1, sysdate(), null, null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(1938446866786041861, '分包方物料删除', 1938446866786041857, '4', '#', '', 1, 0, 'F', '0', '0', 'contractor:contractorMaterial:remove', '#', 103, 1, sysdate(), null, null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(1938446866786041862, '分包方物料导出', 1938446866786041857, '5', '#', '', 1, 0, 'F', '0', '0', 'contractor:contractorMaterial:export', '#', 103, 1, sysdate(), null, null, ''); diff --git a/xinnengyuan/script/sql/xinnengyuan.sql b/xinnengyuan/script/sql/xinnengyuan.sql index 6c6bbe57..906721a2 100644 --- a/xinnengyuan/script/sql/xinnengyuan.sql +++ b/xinnengyuan/script/sql/xinnengyuan.sql @@ -155,7 +155,7 @@ CREATE TABLE `bus_contractor` collate = utf8mb4_general_ci comment = '分包单位' ROW_FORMAT = DYNAMIC; -DROP TABLE IF EXISTS `bus_construction_user`; +DROP TABLE IF EXISTS sub_construction_user; CREATE TABLE `bus_construction_user` ( `id` bigint not null auto_increment, @@ -509,7 +509,7 @@ CREATE TABLE `bus_construction_blacklist` INDEX `idx_user_id` (`user_id` ASC) USING BTREE comment '用户id' ) comment = '黑名单' collate = utf8mb4_unicode_ci; -DROP TABLE IF EXISTS `bus_construction_user_file`; +DROP TABLE IF EXISTS sub_construction_user_file; CREATE TABLE `bus_construction_user_file` ( `id` bigint not null auto_increment comment '主键id', @@ -1176,7 +1176,7 @@ CREATE TABLE `sys_user_file` unique index `idx_user_file` (`user_id`, `file_id`) using btree comment '用户id_文件id' ) comment = '用户文件关联' collate = utf8mb4_unicode_ci; -DROP TABLE IF EXISTS `bus_subcontract`; +DROP TABLE IF EXISTS sub_subcontract; CREATE TABLE `bus_subcontract` ( `id` bigint not null auto_increment comment '主键id', @@ -1242,24 +1242,24 @@ CREATE TABLE `qlt_knowledge_document` index `idx_project_id` (`project_id` asc) using btree comment '项目id' ) comment '质量知识库' collate = utf8mb4_unicode_ci; -DROP TABLE IF EXISTS `bus_contractor_tool`; +DROP TABLE IF EXISTS sub_contractor_tool; CREATE TABLE `bus_contractor_tool` ( - `id` bigint not null auto_increment comment '主键id', - `project_id` bigint not null comment '项目id', - `contractor_id` bigint not null comment '分包方id', - `tool_name` varchar(255) null comment '工具名称', - `tool_type` char(2) null comment '工具类型', - `tool_model` varchar(255) null comment '工具型号', - `tool_number` varchar(255) default 0 not null comment '工具数量', - `file` varchar(512) null comment '文件', - `remark` varchar(512) null comment '备注', - `create_by` varchar(64) null comment '创建者', - `update_by` varchar(64) null comment '更新者', - `create_time` datetime default CURRENT_TIMESTAMP null comment '创建时间', - `update_time` datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP comment '更新时间', - `deleted_at` datetime null comment '删除时间', - `is_delete` tinyint(4) default 0 not null comment '是否删除（0正常 1删除）', + `id` bigint not null auto_increment comment '主键id', + `project_id` bigint not null comment '项目id', + `contractor_id` bigint not null comment '分包方id', + `tool_name` varchar(255) null comment '工具名称', + `tool_type` char(2) null comment '工具类型', + `tool_model` varchar(255) null comment '工具型号', + `tool_number` decimal(10) default 0 not null comment '工具数量', + `file` varchar(512) null comment '文件', + `remark` varchar(512) null comment '备注', + `create_by` varchar(64) null comment '创建者', + `update_by` varchar(64) null comment '更新者', + `create_time` datetime default CURRENT_TIMESTAMP null comment '创建时间', + `update_time` datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP comment '更新时间', + `deleted_at` datetime null comment '删除时间', + `is_delete` tinyint(4) default 0 not null comment '是否删除（0正常 1删除）', primary key (`id`) using btree, index `idx_project_id` (`project_id` asc) using btree comment '项目id', index `idx_contractor_id` (`contractor_id` asc) using btree comment '分包方id' @@ -1273,7 +1273,8 @@ CREATE TABLE `sub_contractor_tool_record` `contractor_id` bigint not null comment '分包方id', `contractor_tool_id` bigint not null comment '分包方工器具id', `record_type` char(1) not null comment '记录类型(1进场 2出场)', - `tool_number` varchar(255) null comment '进场工器具数量', + `record_number` decimal default 0 not null comment '进场工器具数量', + `remaining_number` decimal default 0 not null comment '剩余数量', `check_num` varchar(255) null comment '检测编号', `check_dept` varchar(255) null comment '检测部门', `check_time` datetime null comment '检测时间', @@ -1281,7 +1282,7 @@ CREATE TABLE `sub_contractor_tool_record` `remark` varchar(512) null comment '备注', `create_by` varchar(64) null comment '创建者', `update_by` varchar(64) null comment '更新者', - `entry_time` datetime null comment '进场时间', + `record_time` datetime null comment '记录时间', `create_time` datetime default CURRENT_TIMESTAMP null comment '创建时间', `update_time` datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP comment '更新时间', primary key (`id`) using btree, @@ -1293,21 +1294,22 @@ CREATE TABLE `sub_contractor_tool_record` DROP TABLE IF EXISTS `sub_contractor_material`; CREATE TABLE `sub_contractor_material` ( - `id` bigint not null auto_increment comment '主键id', - `project_id` bigint not null comment '项目id', - `contractor_id` bigint not null comment '分包方id', - `material_name` varchar(255) null comment '物料名称', - `material_type` char(2) null comment '物料类型', - `material_model` varchar(255) null comment '物料型号', - `material_number` varchar(255) default 0 not null comment '物料数量', - `file` varchar(512) null comment '文件', - `remark` varchar(512) null comment '备注', - `create_by` varchar(64) null comment '创建者', - `update_by` varchar(64) null comment '更新者', - `create_time` datetime default CURRENT_TIMESTAMP null comment '创建时间', - `update_time` datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP comment '更新时间', - `deleted_at` datetime null comment '删除时间', - `is_delete` tinyint(4) default 0 not null comment '是否删除（0正常 1删除）', + `id` bigint not null auto_increment comment '主键id', + `project_id` bigint not null comment '项目id', + `contractor_id` bigint not null comment '分包方id', + `material_name` varchar(255) not null comment '物料名称', + `material_type` char(2) null comment '物料类型', + `material_model` varchar(255) null comment '物料型号', + `material_number` decimal(10) default 0 not null comment '物料数量', + `material_unit` varchar(50) not null comment '物料单位', + `file` varchar(512) null comment '文件', + `remark` varchar(512) null comment '备注', + `create_by` varchar(64) null comment '创建者', + `update_by` varchar(64) null comment '更新者', + `create_time` datetime default CURRENT_TIMESTAMP null comment '创建时间', + `update_time` datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP comment '更新时间', + `deleted_at` datetime null comment '删除时间', + `is_delete` tinyint(4) default 0 not null comment '是否删除（0正常 1删除）', primary key (`id`) using btree, index `idx_project_id` (`project_id` asc) using btree comment '项目id', index `idx_contractor_id` (`contractor_id` asc) using btree comment '分包方id' @@ -1316,23 +1318,23 @@ CREATE TABLE `sub_contractor_material` DROP TABLE IF EXISTS `sub_contractor_material_record`; CREATE TABLE `sub_contractor_material_record` ( - `id` bigint not null auto_increment comment '主键id', - `project_id` bigint not null comment '项目id', - `contractor_id` bigint not null comment '分包方id', - `material_id` bigint not null comment '物料id', - `record_type` char(1) not null comment '记录类型(1到货计划 2使用情况)', - `record_time` datetime not null comment '记录时间', - `material_number` varchar(255) null comment '数量', - `material_unit` varchar(50) null comment '单位', - `used_position` varchar(255) null comment '使用位置或构件部位（使用情况）', - `file` varchar(512) null comment '相关附件', - `remark` varchar(512) null comment '备注', - `create_by` varchar(64) null comment '创建者', - `update_by` varchar(64) null comment '更新者', - `create_time` datetime default CURRENT_TIMESTAMP null comment '创建时间', - `update_time` datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP comment '更新时间', + `id` bigint not null auto_increment comment '主键id', + `project_id` bigint not null comment '项目id', + `contractor_id` bigint not null comment '分包方id', + `contractor_material_id` bigint not null comment '物料id', + `record_type` char(1) not null comment '记录类型(1到货计划 2使用情况)', + `record_time` datetime not null comment '记录时间', + `record_number` decimal(10) default 0 not null comment '数量', + `remaining_number` decimal(10) default 0 not null comment '剩余数量(到货 使用)', + `used_position` varchar(255) null comment '使用位置或构件部位(使用情况)', + `file` varchar(512) null comment '相关附件', + `remark` varchar(512) null comment '备注', + `create_by` varchar(64) null comment '创建者', + `update_by` varchar(64) null comment '更新者', + `create_time` datetime default CURRENT_TIMESTAMP null comment '创建时间', + `update_time` datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP comment '更新时间', primary key (`id`) using btree, index `idx_project_id` (`project_id` asc) using btree comment '项目id', index `idx_contractor_id` (`contractor_id` asc) using btree comment '分包方id', - index `idx_material_id` (`material_id` asc) using btree comment '物料id' + index `idx_contractor_material_id` (`contractor_material_id` asc) using btree comment '物料id' ) comment = '分包方物料记录' collate = utf8mb4_unicode_ci;