Commit 5276d3a2 by 涂亚平

居家办公前版本

1 parent 792e310c
Showing with 3529 additions and 238 deletions
......@@ -2,25 +2,175 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="638a5aae-1fdf-4d8e-b485-bccb20a55a3c" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/error/2024-01-22-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2024-01-22-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2024-01-24-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2024-01-26-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/error/2024-02-23-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/error/2024-02-26-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2024-04-15-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2024-04-16-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2024-04-17-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2024-04-18-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2024-04-19-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2024-04-22-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2024-04-24-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2024-04-25-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2024-04-26-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2024-04-28-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2024-05-07-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2024-05-08-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2024-05-13-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2024-08-19-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2024-08-20-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/AcademyCollegeDictController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/AcademyDictController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/AcademyMajorDictController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/AdministerAcademyMappingController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/AdministerLaborMappingController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/LaborGroupDictController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/LaborServiceDictController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/ProjectMemberMappingController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/ServiceFileTreeController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/academy/AcademiesDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/academy/AcademyAccountDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/academy/AddAcademyAccountDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/academy/AddAcademyDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/labor/AddLaborAccountDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/labor/AddLaborDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/labor/LaborAccountDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/labor/LaborsDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/labor/TalentManagementDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/member/AcademyMembersDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/product/ChangeOrderDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/AcademyCollegeDictMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/AcademyDictMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/AcademyMajorDictMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/AdministerAcademyMappingMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/AdministerLaborMappingMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/LaborGroupDictMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/LaborServiceDictMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/ProjectMemberMappingMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/ServiceFileTreeMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/AcademyCollegeDictDO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/AcademyDictDO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/AcademyMajorDictDO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/AdministerAcademyMappingDO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/AdministerLaborMappingDO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/LaborGroupDictDO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/LaborServiceDictDO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/ProjectMemberMappingDO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/ServiceFileTreeDO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/AcademyCollegeDictService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/AcademyDictService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/AcademyMajorDictService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/AdministerAcademyMappingService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/AdministerLaborMappingService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/LaborGroupDictService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/LaborServiceDictService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/ProjectMemberMappingService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/ServiceFileTreeService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/AcademyCollegeDictServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/AcademyDictServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/AcademyMajorDictServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/AdministerAcademyMappingServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/AdministerLaborMappingServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/LaborGroupDictServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/LaborServiceDictServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/ProjectMemberMappingServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/ServiceFileTreeServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/academy/AcademiesVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/academy/AcademyAccountVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/academy/AllAcademyMembersVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/labor/LaborAccountVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/labor/LaborsVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/labor/TalentManagementVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/member/AcademyMembersVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/member/DetailVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/tree/TreesVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/mapper/AcademyCollegeDictMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/mapper/AcademyDictMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/mapper/AcademyMajorDictMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/mapper/AdministerAcademyMappingMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/mapper/AdministerLaborMappingMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/mapper/LaborGroupDictMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/mapper/LaborServiceDictMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/mapper/ProjectMemberMappingMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/mapper/ServiceFileTreeMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback-error.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/springboot-logback-error.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback-info.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/springboot-logback-info.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2023-12-25-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2023-12-26-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/company/OperatorsVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/company/OperatorsVO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2023-07-31-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2023-08-08-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2023-10-11-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2024-01-22-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-01-05-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-01-08-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-01-09-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-01-10-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-01-11-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-01-12-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-01-15-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-01-16-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-01-17-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-01-18-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-01-19-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-01-22-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-01-24-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-01-26-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/CompanyDictController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/CompanyDictController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/MemberController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/MemberController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/ProductDictController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/ProductDictController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/ServiceCompanyFilesController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/ServiceCompanyFilesController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/company/CompanyFilesDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/company/CompanyFilesDTO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/product/AllProductsDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/product/AllProductsDTO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/AdministerMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/AdministerMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/MemberMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/MemberMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/ProductDictMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/ProductDictMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/ServiceCompanyFilesMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/ServiceCompanyFilesMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/model/AdministerDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/AdministerDO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/model/MemberDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/MemberDO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/model/ProductDictDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/ProductDictDO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/model/ServiceCompanyFilesDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/ServiceCompanyFilesDO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/MemberService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/MemberService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/ProductDictService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/ProductDictService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/CompanyDictServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/CompanyDictServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/application-prod.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-prod.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/MemberServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/MemberServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/ProductDictServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/ProductDictServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/ServiceCompanyFilesServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/ServiceCompanyFilesServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/code.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/code.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/AdministerMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/AdministerMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/CompanyDictMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/CompanyDictMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/application-prod.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application-prod.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/MemberMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/MemberMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/ProductDictMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/ProductDictMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/ServiceCompanyFilesMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/ServiceCompanyFilesMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/META-INF/subsidy.kotlin_module" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/subsidy/dto/company/OperatorsVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/subsidy/dto/company/OperatorsVO.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/code.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/code.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/subsidy/controller/CompanyDictController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/subsidy/controller/CompanyDictController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/subsidy/controller/MemberController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/subsidy/controller/MemberController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/subsidy/controller/ProductDictController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/subsidy/controller/ProductDictController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/subsidy/controller/ServiceCompanyFilesController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/subsidy/controller/ServiceCompanyFilesController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/subsidy/dto/company/CompanyFilesDTO.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/subsidy/dto/company/CompanyFilesDTO.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/subsidy/dto/product/AllProductsDTO.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/subsidy/dto/product/AllProductsDTO.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/subsidy/mapper/AdministerMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/subsidy/mapper/AdministerMapper.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/subsidy/mapper/MemberMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/subsidy/mapper/MemberMapper.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/subsidy/mapper/ProductDictMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/subsidy/mapper/ProductDictMapper.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/subsidy/mapper/ServiceCompanyFilesMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/subsidy/mapper/ServiceCompanyFilesMapper.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/subsidy/model/AdministerDO.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/subsidy/model/AdministerDO.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/subsidy/model/MemberDO.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/subsidy/model/MemberDO.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/subsidy/model/ProductDictDO.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/subsidy/model/ProductDictDO.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/subsidy/model/ServiceCompanyFilesDO.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/subsidy/model/ServiceCompanyFilesDO.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/subsidy/service/MemberService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/subsidy/service/MemberService.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/subsidy/service/ProductDictService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/subsidy/service/ProductDictService.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/subsidy/service/impl/AdministerServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/subsidy/service/impl/AdministerServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/subsidy/service/impl/CompanyDictServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/subsidy/service/impl/CompanyDictServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/subsidy/service/impl/MemberServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/subsidy/service/impl/MemberServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/subsidy/service/impl/ProductDictServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/subsidy/service/impl/ProductDictServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/subsidy/service/impl/ServiceCompanyFilesServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/subsidy/service/impl/ServiceCompanyFilesServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/AdministerMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/AdministerMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/CompanyDictMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/CompanyDictMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/MemberMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/MemberMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/ProductDictMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/ProductDictMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/ServiceCompanyFilesMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/ServiceCompanyFilesMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/subsidy-center.jar" beforeDir="false" afterPath="$PROJECT_DIR$/target/subsidy-center.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/subsidy-center.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/subsidy-center.jar.original" afterDir="false" />
</list>
......@@ -114,10 +264,10 @@
</component>
<component name="RecentsManager">
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.subsidy.vo.member" />
<recent name="com.subsidy.controller" />
<recent name="com.subsidy.vo.administer" />
<recent name="com.subsidy.dto.product" />
<recent name="com.subsidy.vo.member" />
<recent name="com.subsidy.vo.company" />
</key>
<key name="CopyFile.RECENT_KEYS">
......@@ -814,13 +964,85 @@
<workItem from="1706578518550" duration="3004000" />
<workItem from="1706664211735" duration="595000" />
<workItem from="1706667936624" duration="4000" />
</task>
<task id="LOCAL-00024" summary="online">
<created>1664517688369</created>
<option name="number" value="00024" />
<option name="presentableId" value="LOCAL-00024" />
<option name="project" value="LOCAL" />
<updated>1664517688369</updated>
<workItem from="1706858024188" duration="64000" />
<workItem from="1708568308783" duration="594000" />
<workItem from="1708568920626" duration="3073000" />
<workItem from="1708654898936" duration="11986000" />
<workItem from="1708673707988" duration="4204000" />
<workItem from="1708912620466" duration="8149000" />
<workItem from="1709002146879" duration="3371000" />
<workItem from="1709084380476" duration="3007000" />
<workItem from="1709171266384" duration="1255000" />
<workItem from="1709256610201" duration="2388000" />
<workItem from="1709517443854" duration="5381000" />
<workItem from="1709602798998" duration="3717000" />
<workItem from="1709688674292" duration="6164000" />
<workItem from="1709775977912" duration="1250000" />
<workItem from="1709861238708" duration="1195000" />
<workItem from="1710126844438" duration="1288000" />
<workItem from="1710383892516" duration="741000" />
<workItem from="1710482744525" duration="595000" />
<workItem from="1710725189892" duration="596000" />
<workItem from="1710730035800" duration="42000" />
<workItem from="1711015980990" duration="65000" />
<workItem from="1711595523878" duration="818000" />
<workItem from="1712542529305" duration="9790000" />
<workItem from="1712560124449" duration="218000" />
<workItem from="1712564456929" duration="152000" />
<workItem from="1712565759587" duration="1782000" />
<workItem from="1712630484934" duration="2028000" />
<workItem from="1712713591457" duration="8420000" />
<workItem from="1712801895921" duration="4325000" />
<workItem from="1712885999982" duration="5071000" />
<workItem from="1713145171504" duration="2723000" />
<workItem from="1713231055662" duration="6557000" />
<workItem from="1713405870596" duration="3805000" />
<workItem from="1713492696765" duration="2544000" />
<workItem from="1713752133780" duration="643000" />
<workItem from="1713836245927" duration="1416000" />
<workItem from="1713922051963" duration="4038000" />
<workItem from="1714009545503" duration="2038000" />
<workItem from="1714094796819" duration="1191000" />
<workItem from="1714269540179" duration="4668000" />
<workItem from="1714357279577" duration="1191000" />
<workItem from="1714441945825" duration="4405000" />
<workItem from="1714960031919" duration="1353000" />
<workItem from="1715048025311" duration="1218000" />
<workItem from="1715217008742" duration="595000" />
<workItem from="1715304446325" duration="611000" />
<workItem from="1715568454884" duration="1253000" />
<workItem from="1718704977734" duration="1023000" />
<workItem from="1718759347688" duration="596000" />
<workItem from="1719293076274" duration="6000" />
<workItem from="1721891923545" duration="7852000" />
<workItem from="1721958373606" duration="6870000" />
<workItem from="1722217131692" duration="12989000" />
<workItem from="1722302901274" duration="2178000" />
<workItem from="1722389295868" duration="5096000" />
<workItem from="1722475690921" duration="4196000" />
<workItem from="1722822037520" duration="3840000" />
<workItem from="1722907503823" duration="1790000" />
<workItem from="1722994544514" duration="3067000" />
<workItem from="1723080761888" duration="1784000" />
<workItem from="1723175251477" duration="923000" />
<workItem from="1723187753215" duration="1338000" />
<workItem from="1723441403644" duration="1633000" />
<workItem from="1723512139129" duration="1190000" />
<workItem from="1723600283602" duration="1786000" />
<workItem from="1723684984326" duration="4742000" />
<workItem from="1723774576376" duration="3904000" />
<workItem from="1724034069411" duration="3101000" />
<workItem from="1724117979153" duration="620000" />
<workItem from="1724143026567" duration="789000" />
<workItem from="1724640250155" duration="409000" />
<workItem from="1724650846465" duration="643000" />
<workItem from="1724722449596" duration="217000" />
<workItem from="1724725948361" duration="761000" />
<workItem from="1724809010806" duration="595000" />
<workItem from="1724895550096" duration="2399000" />
<workItem from="1725518066617" duration="3830000" />
<workItem from="1725586032027" duration="642000" />
<workItem from="1726642869677" duration="2712000" />
</task>
<task id="LOCAL-00025" summary="人脸识别上线版本">
<created>1665485232564</created>
......@@ -1158,7 +1380,14 @@
<option name="project" value="LOCAL" />
<updated>1704424059718</updated>
</task>
<option name="localTasksCounter" value="73" />
<task id="LOCAL-00073" summary="2024.1 多客户端上线,过年备份">
<created>1706858040515</created>
<option name="number" value="00073" />
<option name="presentableId" value="LOCAL-00073" />
<option name="project" value="LOCAL" />
<updated>1706858040515</updated>
</task>
<option name="localTasksCounter" value="74" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -1189,7 +1418,6 @@
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="登录登出数据匹配" />
<MESSAGE value="2023年前备份" />
<MESSAGE value="人社局测试" />
<MESSAGE value="15天数据全部推送备份" />
......@@ -1214,117 +1442,78 @@
<MESSAGE value="1106版本上线" />
<MESSAGE value="30秒以内的视频数据不插入" />
<MESSAGE value="2024.1 企业服务中心 开发前备份" />
<option name="LAST_COMMIT_MESSAGE" value="2024.1 企业服务中心 开发前备份" />
<MESSAGE value="2024.1 多客户端上线,过年备份" />
<option name="LAST_COMMIT_MESSAGE" value="2024.1 多客户端上线,过年备份" />
</component>
<component name="WindowStateProjectService">
<state x="772" y="233" key="#com.intellij.ide.util.MemberChooser" timestamp="1704954567294">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="772" y="233" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040@0.0.1920.1040" timestamp="1704954567294" />
<state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog" timestamp="1703149784295">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1703149784295" />
<state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1705375109174">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1705375109174" />
<state x="703" y="374" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1" timestamp="1703229689295">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="703" y="374" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/0.0.1920.1040@0.0.1920.1040" timestamp="1703229689295" />
<state x="647" y="115" key="CommitChangelistDialog2" timestamp="1704424058280">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="647" y="115" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1704424058280" />
<state width="1676" height="759" key="DebuggerActiveHint" timestamp="1705306400293">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1676" height="759" key="DebuggerActiveHint/0.0.1920.1040@0.0.1920.1040" timestamp="1705306400293" />
<state x="85" y="70" width="1735" height="856" key="DiffContextDialog" timestamp="1702347029299">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="85" y="70" width="1735" height="856" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1702347029299" />
<state x="740" y="278" key="FileChooserDialogImpl" timestamp="1706258175644">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="740" y="278" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1706258175644" />
<state width="1877" height="287" key="GridCell.Tab.0.bottom" timestamp="1706606700796">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="287" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1706606700796" />
<state width="1877" height="287" key="GridCell.Tab.0.center" timestamp="1706606700796">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="287" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1706606700796" />
<state width="1877" height="287" key="GridCell.Tab.0.left" timestamp="1706606700795">
<state x="804" y="182" key="#Project_Structure" timestamp="1721893127093">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="287" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1706606700795" />
<state width="1877" height="287" key="GridCell.Tab.0.right" timestamp="1706606700796">
<state x="804" y="182" key="#Project_Structure/0.0.1920.1040@0.0.1920.1040" timestamp="1721893127093" />
<state x="740" y="275" key="FileChooserDialogImpl" timestamp="1726643050497">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="287" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1706606700796" />
<state width="1877" height="287" key="GridCell.Tab.1.bottom" timestamp="1706606700667">
<state x="740" y="275" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1726643050497" />
<state width="1623" height="182" key="GridCell.Tab.0.bottom" timestamp="1726648496495">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="287" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1706606700667" />
<state width="1877" height="287" key="GridCell.Tab.1.center" timestamp="1706606700667">
<state width="1623" height="182" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1726648496495" />
<state width="1623" height="182" key="GridCell.Tab.0.center" timestamp="1726648496494">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="287" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1706606700667" />
<state width="1877" height="287" key="GridCell.Tab.1.left" timestamp="1706606700667">
<state width="1623" height="182" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1726648496494" />
<state width="1623" height="182" key="GridCell.Tab.0.left" timestamp="1726648496494">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="287" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1706606700667" />
<state width="1877" height="287" key="GridCell.Tab.1.right" timestamp="1706606700667">
<state width="1623" height="182" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1726648496494" />
<state width="1623" height="182" key="GridCell.Tab.0.right" timestamp="1726648496494">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="287" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1706606700667" />
<state x="0" y="678" width="1877" height="287" key="GridCell.Tab.2.bottom" timestamp="1706606700667">
<state width="1623" height="182" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1726648496494" />
<state width="1623" height="169" key="GridCell.Tab.1.bottom" timestamp="1726648496491">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="0" y="678" width="1877" height="287" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1706606700667" />
<state x="0" y="678" width="1877" height="287" key="GridCell.Tab.2.center" timestamp="1706606700667">
<state width="1623" height="169" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1726648496491" />
<state width="1623" height="169" key="GridCell.Tab.1.center" timestamp="1726648496491">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="0" y="678" width="1877" height="287" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1706606700667" />
<state x="0" y="678" width="1877" height="287" key="GridCell.Tab.2.left" timestamp="1706606700667">
<state width="1623" height="169" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1726648496491" />
<state width="1623" height="169" key="GridCell.Tab.1.left" timestamp="1726648496490">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="0" y="678" width="1877" height="287" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1706606700667" />
<state x="0" y="678" width="1877" height="287" key="GridCell.Tab.2.right" timestamp="1706606700667">
<state width="1623" height="169" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1726648496490" />
<state width="1623" height="169" key="GridCell.Tab.1.right" timestamp="1726648496491">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="0" y="678" width="1877" height="287" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1706606700667" />
<state x="772" y="230" key="RollbackChangesDialog" timestamp="1703150615929">
<state width="1623" height="169" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1726648496491" />
<state x="0" y="678" width="1623" height="169" key="GridCell.Tab.2.bottom" timestamp="1726648496491">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="772" y="230" key="RollbackChangesDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1703150615929" />
<state x="461" y="162" key="SettingsEditor" timestamp="1703648011729">
<state x="0" y="678" width="1623" height="169" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1726648496491" />
<state x="0" y="678" width="1623" height="169" key="GridCell.Tab.2.center" timestamp="1726648496491">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="461" y="162" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1703648011729" />
<state x="593" y="256" key="Vcs.Push.Dialog.v2" timestamp="1704424092845">
<state x="0" y="678" width="1623" height="169" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1726648496491" />
<state x="0" y="678" width="1623" height="169" key="GridCell.Tab.2.left" timestamp="1726648496491">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="593" y="256" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1704424092845" />
<state x="-8" y="-8" width="1643" height="840" maximized="true" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1702524842199">
<state x="0" y="678" width="1623" height="169" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1726648496491" />
<state x="0" y="678" width="1623" height="169" key="GridCell.Tab.2.right" timestamp="1726648496491">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="-8" y="-8" width="1643" height="840" maximized="true" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1702524842199" />
<state x="396" y="75" width="1413" height="918" key="find.popup" timestamp="1706067455124">
<state x="0" y="678" width="1623" height="169" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1726648496491" />
<state x="738" y="230" key="RollbackChangesDialog" timestamp="1722234498699">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="396" y="75" width="1413" height="918" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1706067455124" />
<state x="616" y="240" key="run.anything.popup" timestamp="1705288291935">
<state x="738" y="230" key="RollbackChangesDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1722234498699" />
<state x="396" y="75" width="1413" height="918" key="find.popup" timestamp="1726643320164">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="616" y="240" key="run.anything.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1705288291935" />
<state x="686" y="229" width="672" height="678" key="search.everywhere.popup" timestamp="1705287720454">
<state x="396" y="75" width="1413" height="918" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1726643320164" />
<state x="868" y="244" key="run.anything.popup" timestamp="1721894015363">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="686" y="229" width="672" height="678" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1705287720454" />
<state x="868" y="244" key="run.anything.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1721894015363" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......
package com.subsidy.controller;
import com.subsidy.common.ResponseData;
import com.subsidy.common.ResponseVO;
import com.subsidy.model.AcademyCollegeDictDO;
import com.subsidy.service.AcademyCollegeDictService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
/**
* <p>
* 学院字典表 前端控制器
* </p>
*
* @author Tuyp
* @since 2024-04-16
*/
@RestController
@Api(tags = "学院字典表")
@RequestMapping("/academyCollegeDict")
public class AcademyCollegeDictController {
@Autowired
private AcademyCollegeDictService academyCollegeDictService;
@PostMapping("allCollege")
@ApiOperation("查看某院校所有学院 academyId college")
public ResponseVO allCollege(@RequestBody AcademyCollegeDictDO academyCollegeDictDO){
return ResponseData.generateCreatedResponse(0,academyCollegeDictService.allCollege(academyCollegeDictDO));
}
@PostMapping("addCollege")
@ApiOperation("添加院校 academyId college")
public ResponseVO addCollege(@RequestBody AcademyCollegeDictDO academyCollegeDictDO){
return ResponseData.generateCreatedResponse(0,academyCollegeDictService.addCollege(academyCollegeDictDO));
}
@PostMapping("updateCollege")
@ApiOperation("添加学院 id college")
public ResponseVO updateCollege(@RequestBody AcademyCollegeDictDO academyCollegeDictDO){
return ResponseData.generateCreatedResponse(0,academyCollegeDictService.updateCollege(academyCollegeDictDO));
}
@PostMapping("deleteCollege")
@ApiOperation("删除学院 id 学院id ")
public ResponseVO deleteCollege(@RequestBody AcademyCollegeDictDO academyCollegeDictDO){
return ResponseData.generateCreatedResponse(0,academyCollegeDictService.deleteCollege(academyCollegeDictDO));
}
}
package com.subsidy.controller;
import com.subsidy.common.ResponseData;
import com.subsidy.common.ResponseVO;
import com.subsidy.dto.academy.AcademiesDTO;
import com.subsidy.dto.academy.AcademyAccountDTO;
import com.subsidy.dto.academy.AddAcademyAccountDTO;
import com.subsidy.dto.academy.AddAcademyDTO;
import com.subsidy.model.AcademyDictDO;
import com.subsidy.model.AdministerDO;
import com.subsidy.service.AcademyDictService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
/**
* <p>
* 院校字典表 前端控制器
* </p>
*
* @author Tuyp
* @since 2024-02-23
*/
@RestController
@Api(tags = "院校字典表")
@RequestMapping("/academyDict")
public class AcademyDictController {
@Autowired
private AcademyDictService academyDictService;
@PostMapping("/academies")
@ApiOperation("院校管理 academyName pageNum pageSize")
public ResponseVO academies(@RequestBody AcademiesDTO academiesDTO){
return ResponseData.generateCreatedResponse(0,academyDictService.academies(academiesDTO));
}
@PostMapping("addAcademy")
@ApiOperation("添加院校 accountName academyName shortName location academyType telephone userName")
public ResponseVO addAcademy(@RequestBody AddAcademyDTO addAcademyDTO){
return ResponseData.generateCreatedResponse(0,academyDictService.addAcademy(addAcademyDTO));
}
@PostMapping("deleteAcademy")
@ApiOperation("删除院校 id ")
public ResponseVO deleteAcademy(@RequestBody AcademyDictDO academyDictDO){
return ResponseData.generateCreatedResponse(0,academyDictService.deleteAcademy(academyDictDO));
}
@PostMapping("updateAcademy")
@ApiOperation("修改院校 id academyName shortName location academyType accountName telephone userName password")
public ResponseVO updateAcademy(@RequestBody AddAcademyDTO addAcademyDTO){
return ResponseData.generateCreatedResponse(0,academyDictService.updateAcademy(addAcademyDTO));
}
@PostMapping("academyAccount")
@ApiOperation("院校账户管理 pageSize pageNum academyName")
public ResponseVO academyAccount(@RequestBody AcademyAccountDTO academyAccountDTO){
return ResponseData.generateCreatedResponse(0,academyDictService.academyAccount(academyAccountDTO));
}
@PostMapping("addAcademyAccount")
@ApiOperation("添加院校账户 academyIds[] telephone accountName userName password remark ")
public ResponseVO addAcademyAccount(@RequestBody AddAcademyAccountDTO addAcademyAccountDTO){
return ResponseData.generateCreatedResponse(0,academyDictService.addAcademyAccount(addAcademyAccountDTO));
}
@PostMapping("deleteAcademyAccount")
@ApiOperation("删除院校账户 id ")
public ResponseVO deleteAcademyAccount(@RequestBody AdministerDO administerDO){
return ResponseData.generateCreatedResponse(0,academyDictService.deleteAcademyAccount(administerDO));
}
@PostMapping("updateAcademyAccount")
@ApiOperation("编辑院校账户 id academyIds[] telephone accountName userName password ")
public ResponseVO updateAcademyAccount(@RequestBody AddAcademyAccountDTO addAcademyAccountDTO){
return ResponseData.generateCreatedResponse(0,academyDictService.updateAcademyAccount(addAcademyAccountDTO));
}
}
package com.subsidy.controller;
import com.subsidy.common.ResponseData;
import com.subsidy.common.ResponseVO;
import com.subsidy.model.AcademyMajorDictDO;
import com.subsidy.service.AcademyMajorDictService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
/**
* <p>
* 专业字典表 前端控制器
* </p>
*
* @author Tuyp
* @since 2024-04-16
*/
@RestController
@Api(tags = "专业字典表")
@RequestMapping("/academyMajorDict")
public class AcademyMajorDictController {
@Autowired
private AcademyMajorDictService academyMajorDictService;
@PostMapping("majors")
@ApiOperation("查看某个学院下的所有专业 collegeId major")
public ResponseVO majors(@RequestBody AcademyMajorDictDO academyMajorDictDO){
return ResponseData.generateCreatedResponse(0,academyMajorDictService.majors(academyMajorDictDO));
}
@PostMapping("addMajor")
@ApiOperation("查看某个学院下的所有专业 collegeId major")
public ResponseVO addMajor(@RequestBody AcademyMajorDictDO academyMajorDictDO){
return ResponseData.generateCreatedResponse(0,academyMajorDictService.addMajor(academyMajorDictDO));
}
@PostMapping("updateMajor")
@ApiOperation("查看某个学院下的所有专业 id collegeId major")
public ResponseVO updateMajor(@RequestBody AcademyMajorDictDO academyMajorDictDO){
return ResponseData.generateCreatedResponse(0,academyMajorDictService.updateMajor(academyMajorDictDO));
}
@PostMapping("deleteMajor")
@ApiOperation("查看某个学院下的所有专业 id ")
public ResponseVO deleteMajor(@RequestBody AcademyMajorDictDO academyMajorDictDO){
return ResponseData.generateCreatedResponse(0,academyMajorDictService.deleteMajor(academyMajorDictDO));
}
}
package com.subsidy.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
/**
* <p>
* 管理员-院校映射表 前端控制器
* </p>
*
* @author Tuyp
* @since 2024-02-23
*/
@RestController
@Api(tags = "管理员-院校映射表")
@RequestMapping("/administer-academy-mapping-do")
public class AdministerAcademyMappingController {
}
package com.subsidy.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
/**
* <p>
* 管理员-伙伴映射表 前端控制器
* </p>
*
* @author Tuyp
* @since 2024-07-25
*/
@RestController
@Api(tags = "管理员-伙伴映射表")
@RequestMapping("/administer-labor-mapping-do")
public class AdministerLaborMappingController {
}
......@@ -36,7 +36,7 @@ public class CompanyDictController {
@PostMapping("/administers")
@ApiOperation("查询所有企业 {id companyName fieldId 行业id superviseName 监管第三方名称 pageNum pageSize }")
@LoginRequired
// @LoginRequired
public ResponseVO operators(@RequestBody OperatorsDTO operatorsDTO){
return ResponseData.generateCreatedResponse(0,companyDictService.operators(operatorsDTO));
}
......@@ -66,7 +66,7 @@ public class CompanyDictController {
@PostMapping("getCompanyMembers")
@ApiOperation("获取公司里的成员 pageNum pageSize companyId 公司id userName 成员名称 memberStatus")
// @LoginRequired
@LoginRequired
public ResponseVO getCompanyMembers(@RequestBody GetCompanyMembersDTO getCompanyMembersDTO){
return ResponseData.generateCreatedResponse(0,companyDictService.getCompanyMembers(getCompanyMembersDTO));
}
......
package com.subsidy.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
/**
* <p>
* 伙伴群组字典表 前端控制器
* </p>
*
* @author Tuyp
* @since 2024-07-29
*/
@RestController
@Api(tags = "伙伴群组字典表")
@RequestMapping("/labor-group-dict-do")
public class LaborGroupDictController {
}
package com.subsidy.controller;
import com.subsidy.common.ResponseData;
import com.subsidy.common.ResponseVO;
import com.subsidy.dto.academy.AddAcademyAccountDTO;
import com.subsidy.dto.labor.*;
import com.subsidy.model.AdministerDO;
import com.subsidy.model.LaborServiceDictDO;
import com.subsidy.model.ProjectMemberMappingDO;
import com.subsidy.service.LaborServiceDictService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
/**
* <p>
* 劳务公司字典表 前端控制器
* </p>
*
* @author Tuyp
* @since 2024-07-25
*/
@RestController
@Api(tags = "劳务公司字典表")
@RequestMapping("/laborServiceDict")
public class LaborServiceDictController {
@Autowired
private LaborServiceDictService laborServiceDictService;
@PostMapping("labors")
@ApiOperation("伙伴管理 laborServiceName pageSize pageNum")
public ResponseVO labors(@RequestBody LaborsDTO laborsDTO){
return ResponseData.generateCreatedResponse(0,laborServiceDictService.labors(laborsDTO));
}
@PostMapping("addLabor")
@ApiOperation("添加劳务 shortName location laborServiceName serviceCode accountName ")
public ResponseVO addLabor(@RequestBody AddLaborDTO addLaborDTO){
laborServiceDictService.addLabor(addLaborDTO);
return ResponseData.generateCreatedResponse(0);
}
@PostMapping("deleteLabor")
@ApiOperation("删除劳务 id 劳务id")
public ResponseVO deleteLabor(@RequestBody LaborServiceDictDO laborServiceDictDO){
laborServiceDictService.deleteLabor(laborServiceDictDO);
return ResponseData.generateCreatedResponse(0);
}
@PostMapping("updateLabor")
@ApiOperation("编辑劳务 id 劳务id shortName location laborServiceName serviceCode accountName password")
public ResponseVO updateLabor(@RequestBody AddLaborDTO addLaborDTO){
laborServiceDictService.updateLabor(addLaborDTO);
return ResponseData.generateCreatedResponse(0);
}
@PostMapping("laborAccount")
@ApiOperation("伙伴账户 pageSize pageNum laborServiceName")
public ResponseVO laborAccount(@RequestBody LaborAccountDTO laborAccountDTO){
return ResponseData.generateCreatedResponse(0,laborServiceDictService.laborAccount(laborAccountDTO));
}
@PostMapping("addLaborAccount")
@ApiOperation("添加劳务账户 laborIds[] telephone accountName userName password remark ")
public ResponseVO addLaborAccount(@RequestBody AddLaborAccountDTO addLaborAccountDTO){
return ResponseData.generateCreatedResponse(0,laborServiceDictService.addLaborAccount(addLaborAccountDTO));
}
@PostMapping("deleteLaborAccount")
@ApiOperation("删除劳务账户 id ")
public ResponseVO deleteLaborAccount(@RequestBody AdministerDO administerDO){
return ResponseData.generateCreatedResponse(0,laborServiceDictService.deleteLaborAccount(administerDO));
}
@PostMapping("updateLaborAccount")
@ApiOperation("编辑劳务账户 id laborIds[] telephone accountName userName password ")
public ResponseVO updateLaborAccount(@RequestBody AddLaborAccountDTO addLaborAccountDTO){
return ResponseData.generateCreatedResponse(0,laborServiceDictService.updateLaborAccount (addLaborAccountDTO));
}
@PostMapping("talentManagement")
@ApiOperation("用户管理--人才管理 laborId userName pageSize pageNum")
public ResponseVO talentManagement(@RequestBody TalentManagementDTO talentManagementDTO){
return ResponseData.generateCreatedResponse(0,laborServiceDictService.talentManagement(talentManagementDTO));
}
@PostMapping("detail")
@ApiOperation("花名册--详情 memberId 人才id")
public ResponseVO detail(@RequestBody ProjectMemberMappingDO projectMemberMappingDO){
return ResponseData.generateCreatedResponse(0, laborServiceDictService.detail(projectMemberMappingDO));
}
}
package com.subsidy.controller;
import com.subsidy.common.ResponseData;
import com.subsidy.common.ResponseVO;
import com.subsidy.dto.member.AcademyMembersDTO;
import com.subsidy.model.MemberDO;
import com.subsidy.service.MemberService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
......@@ -16,7 +25,18 @@ import io.swagger.annotations.Api;
*/
@RestController
@Api(tags = "学生表")
@RequestMapping("/member-do")
@RequestMapping("/member")
public class MemberController {
@Autowired
private MemberService memberService;
@PostMapping("academyMembers")
@ApiOperation("用户管理-学生管理 academyId practiceStatus userName")
public ResponseVO academyMembers(@RequestBody AcademyMembersDTO academyMembersDTO){
return ResponseData.generateCreatedResponse(0,memberService.academyMembers(academyMembersDTO));
}
}
......@@ -4,6 +4,7 @@ package com.subsidy.controller;
import com.subsidy.common.ResponseData;
import com.subsidy.common.ResponseVO;
import com.subsidy.dto.product.AllProductsDTO;
import com.subsidy.dto.product.ChangeOrderDTO;
import com.subsidy.model.ProductDictDO;
import com.subsidy.service.ProductDictService;
import io.swagger.annotations.ApiOperation;
......@@ -33,7 +34,7 @@ public class ProductDictController {
private ProductDictService productDictService;
@PostMapping("allProducts")
@ApiOperation("查看所有产品 productName pageSize pageNum")
@ApiOperation("查看所有产品 productName pageSize pageNum productType 0:企业产品 1:院校产品 2:伙伴产品")
public ResponseVO allProducts(@RequestBody AllProductsDTO allProductsDTO){
return ResponseData.generateCreatedResponse(0,productDictService.allProducts(allProductsDTO));
}
......@@ -56,5 +57,16 @@ public class ProductDictController {
return ResponseData.generateCreatedResponse(0,productDictService.updateProduct(productDictDO));
}
@PostMapping("changeOrder")
@ApiOperation("排序 productDictDOS [id]")
public ResponseVO changeOrder(@RequestBody ChangeOrderDTO changeOrderDTO){
return ResponseData.generateCreatedResponse(0,productDictService.changeOrder(changeOrderDTO));
}
@PostMapping("frontPage")
@ApiOperation("首页展示产品 productType 0:企业产品 1:院校产品 ")
public ResponseVO frontPage(@RequestBody ProductDictDO productDictDO){
return ResponseData.generateCreatedResponse(0,productDictService.frontPage(productDictDO));
}
}
package com.subsidy.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
/**
* <p>
* 项目人员映射表 前端控制器
* </p>
*
* @author Tuyp
* @since 2024-07-29
*/
@RestController
@Api(tags = "项目人员映射表")
@RequestMapping("/project-member-mapping-do")
public class ProjectMemberMappingController {
}
......@@ -35,7 +35,7 @@ public class ServiceCompanyFilesController {
private ServiceCompanyFilesService serviceCompanyFilesService;
@PostMapping("companyFiles")
@ApiOperation("查看业务合同/业务材料 pageSize pageNum fileName serviceCompanyId fileType 0:业务合同 1:业务材料 ")
@ApiOperation("查看业务合同/业务材料 pageSize pageNum fileName treeId ")
public ResponseVO companyFiles(@RequestBody CompanyFilesDTO companyFilesDTO){
return ResponseData.generateCreatedResponse(0,serviceCompanyFilesService.companyFiles(companyFilesDTO));
}
......@@ -47,7 +47,7 @@ public class ServiceCompanyFilesController {
}
@PostMapping("uploadFile")
@ApiOperation("上传新文件 serviceCompanyId fileType 0:业务合同 1:业务材料 fileName fileAddress ")
@ApiOperation("上传新文件 treeId fileName fileAddress ")
public ResponseVO uploadFile(@RequestBody ServiceCompanyFilesDO serviceCompanyFilesDO){
return ResponseData.generateCreatedResponse(0,serviceCompanyFilesService.uploadFile(serviceCompanyFilesDO));
}
......
package com.subsidy.controller;
import com.subsidy.common.ResponseData;
import com.subsidy.common.ResponseVO;
import com.subsidy.model.ServiceFileTreeDO;
import com.subsidy.service.ServiceFileTreeService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
/**
* <p>
* 前端控制器
* </p>
*
* @author Tuyp
* @since 2024-04-08
*/
@RestController
@Api(tags = "文件目录树")
@RequestMapping("/serviceFileTree")
public class ServiceFileTreeController {
@Autowired
private ServiceFileTreeService serviceFileTreeService;
@PostMapping("trees")
@ApiOperation("##2024.4##查看某公司的目录树 companyId serviceId")
public ResponseVO trees(@RequestBody ServiceFileTreeDO serviceFileTreeDO){
return ResponseData.generateCreatedResponse(0,serviceFileTreeService.trees(serviceFileTreeDO));
}
@PostMapping("addTree")
@ApiOperation("##2024.4##添加树节点 companyId serviceId parentId treeName")
public ResponseVO addTree(@RequestBody ServiceFileTreeDO serviceFileTreeDO){
return ResponseData.generateCreatedResponse(0,serviceFileTreeService.addTree(serviceFileTreeDO));
}
@PostMapping("updateTree")
@ApiOperation("##2024.4##修改树节点 id treeName")
public ResponseVO updateTree(@RequestBody ServiceFileTreeDO serviceFileTreeDO){
return ResponseData.generateCreatedResponse(0,serviceFileTreeService.updateTree(serviceFileTreeDO));
}
@PostMapping("deleteTree")
@ApiOperation("##2024.4##删除树节点 id ")
public ResponseVO deleteTree(@RequestBody ServiceFileTreeDO serviceFileTreeDO){
return ResponseData.generateCreatedResponse(0,serviceFileTreeService.deleteTree(serviceFileTreeDO));
}
}
package com.subsidy.dto.academy;
import lombok.Data;
@Data
public class AcademiesDTO {
private String academyName;
private Integer pageSize;
private Integer pageNum;
}
package com.subsidy.dto.academy;
import lombok.Data;
@Data
public class AcademyAccountDTO {
private Integer pageSize;
private Integer pageNum;
private String academyName;
}
package com.subsidy.dto.academy;
import com.subsidy.model.AdministerDO;
import lombok.Data;
import java.util.List;
@Data
public class AddAcademyAccountDTO extends AdministerDO {
private List<Long> academyIds;
}
package com.subsidy.dto.academy;
import com.subsidy.model.AcademyDictDO;
import lombok.Data;
@Data
public class AddAcademyDTO extends AcademyDictDO {
private String accountName;
private String telephone;
private String userName;
private String password;
}
......@@ -11,8 +11,8 @@ public class CompanyFilesDTO {
private String fileName;
private Long serviceCompanyId;
private Long treeId;
private Integer fileType;
private Long serviceCompanyId;
}
package com.subsidy.dto.labor;
import com.subsidy.model.AdministerDO;
import lombok.Data;
import java.util.List;
@Data
public class AddLaborAccountDTO extends AdministerDO {
private List<Long> laborIds;
}
package com.subsidy.dto.labor;
import lombok.Data;
@Data
public class AddLaborDTO {
private Long id;
private String shortName;
private String location;
private String laborServiceName;
private String serviceCode;
private String accountName;
private String password;
}
package com.subsidy.dto.labor;
import lombok.Data;
@Data
public class LaborAccountDTO {
private Integer pageSize;
private Integer pageNum;
private String laborServiceName;
}
package com.subsidy.dto.labor;
import lombok.Data;
@Data
public class LaborsDTO {
private Integer pageSize;
private Integer pageNum;
private String laborServiceName;
}
package com.subsidy.dto.labor;
import lombok.Data;
@Data
public class TalentManagementDTO {
private Integer pageSize;
private Integer pageNum;
private String userName;
private Long laborId;
}
package com.subsidy.dto.member;
import lombok.Data;
@Data
public class AcademyMembersDTO {
private Integer pageNum;
private Integer pageSize;
private Long academyId;
private String userName;
private String practiceStatus;
}
......@@ -11,4 +11,6 @@ public class AllProductsDTO {
private String productName;
private Integer productType;
}
package com.subsidy.dto.product;
import com.subsidy.model.ProductDictDO;
import lombok.Data;
import java.util.List;
@Data
public class ChangeOrderDTO {
private List<Long> productDictDOS;
}
package com.subsidy.mapper;
import com.subsidy.model.AcademyCollegeDictDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* <p>
* 学院字典表 Mapper 接口
* </p>
*
* @author Tuyp
* @since 2024-04-16
*/
@Repository
public interface AcademyCollegeDictMapper extends BaseMapper<AcademyCollegeDictDO> {
List<AcademyCollegeDictDO> allCollege(Long academyId, String college);
}
package com.subsidy.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.subsidy.model.AcademyDictDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.subsidy.model.AdministerDO;
import com.subsidy.vo.academy.AcademiesVO;
import com.subsidy.vo.academy.AcademyAccountVO;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* <p>
* 院校字典表 Mapper 接口
* </p>
*
* @author Tuyp
* @since 2024-02-23
*/
@Repository
public interface AcademyDictMapper extends BaseMapper<AcademyDictDO> {
/**
* 查看所有院校
*/
IPage<AcademiesVO> academies(IPage iPage, String academyName);
/**
* 查看院校账号
*/
IPage<AcademyAccountVO> academyAccount(IPage iPage, String academyName);
/**
* 查看账户关联的院校
*/
List<AcademyDictDO> accountAcademies(Long administerId);
/**
* 查看账户关联的院校 返回id
*/
List<Long> accountAcademyIds(Long administerId);
/**
* 查看院校主账号
*/
AdministerDO mainAccount(Long academyId);
}
package com.subsidy.mapper;
import com.subsidy.model.AcademyMajorDictDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* <p>
* 专业字典表 Mapper 接口
* </p>
*
* @author Tuyp
* @since 2024-04-16
*/
@Repository
public interface AcademyMajorDictMapper extends BaseMapper<AcademyMajorDictDO> {
List<AcademyMajorDictDO> majors(Long collegeId, String major);
}
package com.subsidy.mapper;
import com.subsidy.model.AdministerAcademyMappingDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
/**
* <p>
* 管理员-院校映射表 Mapper 接口
* </p>
*
* @author Tuyp
* @since 2024-02-23
*/
@Repository
public interface AdministerAcademyMappingMapper extends BaseMapper<AdministerAcademyMappingDO> {
}
package com.subsidy.mapper;
import com.subsidy.model.AdministerLaborMappingDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
/**
* <p>
* 管理员-伙伴映射表 Mapper 接口
* </p>
*
* @author Tuyp
* @since 2024-07-25
*/
@Repository
public interface AdministerLaborMappingMapper extends BaseMapper<AdministerLaborMappingDO> {
}
......@@ -36,8 +36,6 @@ public interface AdministerMapper extends BaseMapper<AdministerDO> {
*/
IPage<AdministerVO> clientOperators(IPage page, String userName, String companyName);
/**
* 查看某客户账号管理哪些公司
*/
......@@ -53,6 +51,12 @@ public interface AdministerMapper extends BaseMapper<AdministerDO> {
*/
List<Long> administerServiceIds(Long administerId);
List<PermissionsVO> getPermissions(Long id);
/**
* 查看企业的唯一账号id
*/
AdministerDO uniqueAdminister(Long companyId);
}
package com.subsidy.mapper;
import com.subsidy.model.LaborGroupDictDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
/**
* <p>
* 伙伴群组字典表 Mapper 接口
* </p>
*
* @author Tuyp
* @since 2024-07-29
*/
@Repository
public interface LaborGroupDictMapper extends BaseMapper<LaborGroupDictDO> {
}
package com.subsidy.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.subsidy.model.LaborServiceDictDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.subsidy.vo.labor.LaborAccountVO;
import com.subsidy.vo.labor.LaborsVO;
import com.subsidy.vo.labor.TalentManagementVO;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* <p>
* 劳务公司字典表 Mapper 接口
* </p>
*
* @author Tuyp
* @since 2024-07-25
*/
@Repository
public interface LaborServiceDictMapper extends BaseMapper<LaborServiceDictDO> {
IPage<LaborsVO> labors(IPage iPage, String laborServiceName);
/**
* 查看伙伴账户
*/
IPage<LaborAccountVO> laborAccount(IPage iPage, String accountName);
/**
* 某个账户关联多少个伙伴
*/
List<LaborServiceDictDO> relateLabors(Long administerId);
/**
* 查看账号下关联的伙伴ids
*/
List<Long> accountLabors(Long administerId);
/**
* 人才管理
*/
IPage<TalentManagementVO> talentManagement(IPage iPage,Long laborId,String userName);
}
package com.subsidy.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.subsidy.model.MemberDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.subsidy.vo.member.AcademyMembersVO;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* <p>
* 学生表 Mapper 接口
......@@ -12,7 +16,9 @@ import org.springframework.stereotype.Repository;
* @author Tuyp
* @since 2024-01-11
*/
@Repository
@Repository
public interface MemberMapper extends BaseMapper<MemberDO> {
IPage<AcademyMembersVO> academyMembers(IPage iPage, String userName, String practiceStatus, Long academyId);
}
......@@ -16,7 +16,8 @@ import org.springframework.stereotype.Repository;
@Repository
public interface ProductDictMapper extends BaseMapper<ProductDictDO> {
IPage<ProductDictDO> allProducts(IPage iPage, String productName);
IPage<ProductDictDO> allProducts(IPage iPage, String productName,Integer productType);
void updateOrderNo(Long id,Integer orderNo);
}
package com.subsidy.mapper;
import com.subsidy.model.ProjectMemberMappingDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.subsidy.vo.member.DetailVO;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* <p>
* 项目人员映射表 Mapper 接口
* </p>
*
* @author Tuyp
* @since 2024-07-29
*/
@Repository
public interface ProjectMemberMappingMapper extends BaseMapper<ProjectMemberMappingDO> {
/**
* 查看某个人的入职记录
*/
List<DetailVO> detail(Long memberId);
}
......@@ -18,7 +18,7 @@ import java.util.List;
@Repository
public interface ServiceCompanyFilesMapper extends BaseMapper<ServiceCompanyFilesDO> {
IPage<ServiceCompanyFilesDO> companyFiles(IPage page,Integer fileType,Long serviceCompanyId, String fileName);
IPage<ServiceCompanyFilesDO> companyFiles(IPage page,List<Long> treeIds, String fileName);
}
package com.subsidy.mapper;
import com.subsidy.model.ServiceFileTreeDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
/**
* <p>
* Mapper 接口
* </p>
*
* @author Tuyp
* @since 2024-04-08
*/
@Repository
public interface ServiceFileTreeMapper extends BaseMapper<ServiceFileTreeDO> {
}
package com.subsidy.model;
import com.subsidy.util.BaseModel;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 学院字典表
* </p>
*
* @author Tuyp
* @since 2024-04-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("academy_college_dict")
public class AcademyCollegeDictDO extends BaseModel {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 学校id
*/
private Long academyId;
private String college;
}
package com.subsidy.model;
import com.subsidy.util.BaseModel;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 院校字典表
* </p>
*
* @author Tuyp
* @since 2024-02-23
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("academy_dict")
public class AcademyDictDO extends BaseModel {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 院校名称
*/
private String academyName;
/**
* 简称
*/
private String shortName;
/**
* 所在地
*/
private String location;
/**
* 院校类型
*/
private String academyType;
}
package com.subsidy.model;
import com.subsidy.util.BaseModel;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 专业字典表
* </p>
*
* @author Tuyp
* @since 2024-04-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("academy_major_dict")
public class AcademyMajorDictDO extends BaseModel {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
private Long collegeId;
private String major;
}
package com.subsidy.model;
import com.subsidy.util.BaseModel;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 管理员-院校映射表
* </p>
*
* @author Tuyp
* @since 2024-02-23
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("administer_academy_mapping")
public class AdministerAcademyMappingDO extends BaseModel {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
private Long administerId;
private Long academyId;
}
......@@ -49,6 +49,11 @@ public class AdministerDO extends BaseModel {
private Long companyId;
/**
* 劳务id
*/
private Long laborId;
/**
* 成员名称
*/
private String userName;
......
package com.subsidy.model;
import com.subsidy.util.BaseModel;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 管理员-伙伴映射表
* </p>
*
* @author Tuyp
* @since 2024-07-25
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("administer_labor_mapping")
public class AdministerLaborMappingDO extends BaseModel {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
private Long administerId;
private Long laborId;
}
package com.subsidy.model;
import com.subsidy.util.BaseModel;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 伙伴群组字典表
* </p>
*
* @author Tuyp
* @since 2024-07-29
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("labor_group_dict")
public class LaborGroupDictDO extends BaseModel {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
private Long laborId;
private Long parentId;
private String groupName;
}
package com.subsidy.model;
import com.subsidy.util.BaseModel;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 劳务公司字典表
* </p>
*
* @author Tuyp
* @since 2024-07-25
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("labor_service_dict")
public class LaborServiceDictDO extends BaseModel {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
private String laborServiceName;
private String shortName;
private String location;
private String serviceCode;
}
......@@ -26,6 +26,8 @@ public class MemberDO extends BaseModel {
@TableId(value = "id", type = IdType.AUTO)
private Long id;
private Long academyId;
/**
* 姓名
*/
......@@ -106,5 +108,29 @@ public class MemberDO extends BaseModel {
*/
private String wechat;
/**
* 实习状态
*/
private String practiceStatus;
/**
* 学院id
*/
private Long collegeId;
/**
* 专业id
*/
private String major;
/**
* 入学年份
*/
private String enrollmentYear;
/**
* 人员类型 0:学院 2 :职工
*/
private Integer memberType;
}
......@@ -49,5 +49,10 @@ public class ProductDictDO extends BaseModel {
private String highlightTag;
private Integer orderNo;
private Integer frontPage;
private Integer productType;
}
package com.subsidy.model;
import com.subsidy.util.BaseModel;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 项目人员映射表
* </p>
*
* @author Tuyp
* @since 2024-07-29
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("project_member_mapping")
public class ProjectMemberMappingDO extends BaseModel {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 人员id
*/
private Long memberId;
/**
* 项目id
*/
private Long projectId;
/**
* 职位名称
*/
private String jobName;
/**
* 工资
*/
private String salary;
/**
* 排序
*/
private Integer orderNo;
/**
* 1:在职 0 已离职
*/
private Integer status;
}
......@@ -25,12 +25,7 @@ public class ServiceCompanyFilesDO extends BaseModel {
@TableId(value = "id", type = IdType.AUTO)
private Long id;
private Long serviceCompanyId;
/**
* 0:业务合同 1:业务材料
*/
private String fileType;
private Long treeId;
private String fileName;
......
package com.subsidy.model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.subsidy.util.BaseModel;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
*
* </p>
*
* @author Tuyp
* @since 2024-04-08
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("service_file_tree")
public class ServiceFileTreeDO extends BaseModel {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 公司id
*/
private Long companyId;
/**
* 业务id
*/
private Long serviceId;
/**
* 父节点
*/
private Long parentId;
private String treeName;
}
package com.subsidy.service;
import com.subsidy.model.AcademyCollegeDictDO;
import com.baomidou.mybatisplus.extension.service.IService;
import com.subsidy.vo.academy.AllAcademyMembersVO;
import java.util.List;
/**
* <p>
* 学院字典表 服务类
* </p>
*
* @author Tuyp
* @since 2024-04-16
*/
public interface AcademyCollegeDictService extends IService<AcademyCollegeDictDO> {
List<AcademyCollegeDictDO> allCollege(AcademyCollegeDictDO academyCollegeDictDO);
String addCollege(AcademyCollegeDictDO academyCollegeDictDO);
String updateCollege(AcademyCollegeDictDO academyCollegeDictDO);
String deleteCollege(AcademyCollegeDictDO academyCollegeDictDO);
}
package com.subsidy.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.subsidy.dto.academy.AcademiesDTO;
import com.subsidy.dto.academy.AcademyAccountDTO;
import com.subsidy.dto.academy.AddAcademyAccountDTO;
import com.subsidy.dto.academy.AddAcademyDTO;
import com.subsidy.model.AcademyDictDO;
import com.baomidou.mybatisplus.extension.service.IService;
import com.subsidy.model.AdministerDO;
import com.subsidy.vo.academy.AcademiesVO;
/**
* <p>
* 院校字典表 服务类
* </p>
*
* @author Tuyp
* @since 2024-02-23
*/
public interface AcademyDictService extends IService<AcademyDictDO> {
IPage<AcademiesVO> academies(AcademiesDTO academiesDTO);
String addAcademy(AddAcademyDTO addAcademyDTO);
String deleteAcademy(AcademyDictDO academyDictDO);
String updateAcademy(AddAcademyDTO addAcademyDTO);
IPage academyAccount(AcademyAccountDTO academyAccountDTO);
String addAcademyAccount(AddAcademyAccountDTO addAcademyAccountDTO);
String deleteAcademyAccount(AdministerDO administerDO);
String updateAcademyAccount(AddAcademyAccountDTO addAcademyAccountDTO);
}
package com.subsidy.service;
import com.subsidy.model.AcademyMajorDictDO;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* <p>
* 专业字典表 服务类
* </p>
*
* @author Tuyp
* @since 2024-04-16
*/
public interface AcademyMajorDictService extends IService<AcademyMajorDictDO> {
List<AcademyMajorDictDO> majors(AcademyMajorDictDO academyMajorDictDO);
String addMajor(AcademyMajorDictDO academyMajorDictDO);
String updateMajor(AcademyMajorDictDO academyMajorDictDO);
String deleteMajor(AcademyMajorDictDO academyMajorDictDO);
}
package com.subsidy.service;
import com.subsidy.model.AdministerAcademyMappingDO;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 管理员-院校映射表 服务类
* </p>
*
* @author Tuyp
* @since 2024-02-23
*/
public interface AdministerAcademyMappingService extends IService<AdministerAcademyMappingDO> {
}
package com.subsidy.service;
import com.subsidy.model.AdministerLaborMappingDO;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 管理员-伙伴映射表 服务类
* </p>
*
* @author Tuyp
* @since 2024-07-25
*/
public interface AdministerLaborMappingService extends IService<AdministerLaborMappingDO> {
}
package com.subsidy.service;
import com.subsidy.model.LaborGroupDictDO;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 伙伴群组字典表 服务类
* </p>
*
* @author Tuyp
* @since 2024-07-29
*/
public interface LaborGroupDictService extends IService<LaborGroupDictDO> {
}
package com.subsidy.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.subsidy.dto.academy.AddAcademyAccountDTO;
import com.subsidy.dto.labor.*;
import com.subsidy.model.AdministerDO;
import com.subsidy.model.LaborServiceDictDO;
import com.baomidou.mybatisplus.extension.service.IService;
import com.subsidy.model.ProjectMemberMappingDO;
import com.subsidy.vo.labor.LaborAccountVO;
import com.subsidy.vo.labor.TalentManagementVO;
import com.subsidy.vo.member.DetailVO;
import java.util.List;
/**
* <p>
* 劳务公司字典表 服务类
* </p>
*
* @author Tuyp
* @since 2024-07-25
*/
public interface LaborServiceDictService extends IService<LaborServiceDictDO> {
IPage labors(LaborsDTO laborsDTO);
void addLabor(AddLaborDTO addLaborDTO);
void deleteLabor(LaborServiceDictDO laborServiceDictDO);
void updateLabor(AddLaborDTO addLaborDTO);
IPage<LaborAccountVO> laborAccount(LaborAccountDTO laborAccountDTO);
String addLaborAccount(AddLaborAccountDTO addLaborAccountDTO);
String deleteLaborAccount(AdministerDO administerDO);
String updateLaborAccount(AddLaborAccountDTO addLaborAccountDTO);
IPage<TalentManagementVO> talentManagement(TalentManagementDTO talentManagementDTO);
List<DetailVO> detail(ProjectMemberMappingDO projectMemberMappingDO);
}
package com.subsidy.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.subsidy.dto.member.AcademyMembersDTO;
import com.subsidy.model.MemberDO;
import com.baomidou.mybatisplus.extension.service.IService;
import com.subsidy.vo.member.AcademyMembersVO;
/**
* <p>
......@@ -13,4 +16,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface MemberService extends IService<MemberDO> {
IPage<AcademyMembersVO> academyMembers(AcademyMembersDTO academyMembersDTO);
}
......@@ -2,9 +2,12 @@ package com.subsidy.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.subsidy.dto.product.AllProductsDTO;
import com.subsidy.dto.product.ChangeOrderDTO;
import com.subsidy.model.ProductDictDO;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* <p>
* 产品管理字典表 服务类
......@@ -23,4 +26,7 @@ public interface ProductDictService extends IService<ProductDictDO> {
String updateProduct(ProductDictDO productDictDO);
String changeOrder(ChangeOrderDTO changeOrderDTO);
List<ProductDictDO> frontPage(ProductDictDO productDictDO);
}
package com.subsidy.service;
import com.subsidy.model.ProjectMemberMappingDO;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 项目人员映射表 服务类
* </p>
*
* @author Tuyp
* @since 2024-07-29
*/
public interface ProjectMemberMappingService extends IService<ProjectMemberMappingDO> {
}
package com.subsidy.service;
import com.subsidy.model.ServiceFileTreeDO;
import com.baomidou.mybatisplus.extension.service.IService;
import com.subsidy.vo.tree.TreesVO;
import java.util.List;
/**
* <p>
* 服务类
* </p>
*
* @author Tuyp
* @since 2024-04-08
*/
public interface ServiceFileTreeService extends IService<ServiceFileTreeDO> {
List<TreesVO> trees(ServiceFileTreeDO serviceFileTreeDO);
String addTree(ServiceFileTreeDO serviceFileTreeDO);
String updateTree(ServiceFileTreeDO serviceFileTreeDO);
String deleteTree(ServiceFileTreeDO serviceFileTreeDO);
}
package com.subsidy.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.subsidy.common.exception.HttpException;
import com.subsidy.mapper.AcademyDictMapper;
import com.subsidy.mapper.AcademyMajorDictMapper;
import com.subsidy.mapper.MemberMapper;
import com.subsidy.model.AcademyCollegeDictDO;
import com.subsidy.mapper.AcademyCollegeDictMapper;
import com.subsidy.model.AcademyDictDO;
import com.subsidy.model.AcademyMajorDictDO;
import com.subsidy.model.MemberDO;
import com.subsidy.service.AcademyCollegeDictService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.subsidy.util.ConstantUtils;
import com.subsidy.vo.academy.AllAcademyMembersVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 学院字典表 服务实现类
* </p>
*
* @author Tuyp
* @since 2024-04-16
*/
@Service
public class AcademyCollegeDictServiceImpl extends ServiceImpl<AcademyCollegeDictMapper, AcademyCollegeDictDO> implements AcademyCollegeDictService {
@Autowired
private AcademyMajorDictMapper academyMajorDictMapper;
@Autowired
private MemberMapper memberMapper;
@Autowired
private AcademyDictMapper academyDictMapper;
public List<AcademyCollegeDictDO> allCollege(AcademyCollegeDictDO academyCollegeDictDO) {
return this.baseMapper.allCollege(academyCollegeDictDO.getAcademyId(),academyCollegeDictDO.getCollege());
}
public String addCollege(AcademyCollegeDictDO academyCollegeDictDO) {
int count = this.baseMapper.selectCount(new QueryWrapper<AcademyCollegeDictDO>()
.lambda()
.eq(AcademyCollegeDictDO::getAcademyId, academyCollegeDictDO.getCollege()));
if (count > 0) {
throw new HttpException(24001);
}
this.baseMapper.insert(academyCollegeDictDO);
return ConstantUtils.ADD_SUCCESS;
}
public String updateCollege(AcademyCollegeDictDO academyCollegeDictDO) {
int count = this.baseMapper.selectCount(new QueryWrapper<AcademyCollegeDictDO>()
.lambda()
.eq(AcademyCollegeDictDO::getAcademyId, academyCollegeDictDO.getCollege())
.ne(AcademyCollegeDictDO::getId, academyCollegeDictDO.getId()));
if (count > 0) {
throw new HttpException(24001);
}
this.baseMapper.updateById(academyCollegeDictDO);
return ConstantUtils.SUCCESS_UPDATE;
}
public String deleteCollege(AcademyCollegeDictDO academyCollegeDictDO) {
this.baseMapper.deleteById(academyCollegeDictDO.getId());
academyMajorDictMapper.delete(new QueryWrapper<AcademyMajorDictDO>()
.lambda()
.eq(AcademyMajorDictDO::getCollegeId, academyCollegeDictDO.getId()));
memberMapper.delete(new QueryWrapper<MemberDO>()
.lambda()
.eq(MemberDO::getCollegeId, academyCollegeDictDO.getId()));
return ConstantUtils.DELETE_SUCCESS;
}
}
package com.subsidy.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.subsidy.common.exception.HttpException;
import com.subsidy.dto.academy.AcademiesDTO;
import com.subsidy.dto.academy.AcademyAccountDTO;
import com.subsidy.dto.academy.AddAcademyAccountDTO;
import com.subsidy.dto.academy.AddAcademyDTO;
import com.subsidy.mapper.AdministerAcademyMappingMapper;
import com.subsidy.mapper.AdministerMapper;
import com.subsidy.model.AcademyDictDO;
import com.subsidy.mapper.AcademyDictMapper;
import com.subsidy.model.AdministerAcademyMappingDO;
import com.subsidy.model.AdministerCompanyMappingDO;
import com.subsidy.model.AdministerDO;
import com.subsidy.service.AcademyDictService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.subsidy.util.ConstantUtils;
import com.subsidy.vo.academy.AcademiesVO;
import com.subsidy.vo.academy.AcademyAccountVO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.xml.ws.Action;
import java.util.ArrayList;
import java.util.List;
/**
* <p>
* 院校字典表 服务实现类
* </p>
*
* @author Tuyp
* @since 2024-02-23
*/
@Service
public class AcademyDictServiceImpl extends ServiceImpl<AcademyDictMapper, AcademyDictDO> implements AcademyDictService {
@Autowired
private AdministerMapper administerMapper;
@Autowired
private AdministerAcademyMappingMapper administerAcademyMappingMapper;
public IPage<AcademiesVO> academies(AcademiesDTO academiesDTO) {
Page pager = new Page(academiesDTO.getPageNum(), academiesDTO.getPageSize());
return this.baseMapper.academies(pager, academiesDTO.getAcademyName());
}
@Transactional(rollbackFor = Exception.class)
public String addAcademy(AddAcademyDTO addAcademyDTO) {
int count = this.baseMapper.selectCount(new QueryWrapper<AcademyDictDO>()
.lambda()
.eq(AcademyDictDO::getAcademyName, addAcademyDTO.getAcademyName()));
if (count > 0) {
throw new HttpException(10030);
}
//院校
AcademyDictDO academyDictDO = new AcademyDictDO();
BeanUtils.copyProperties(addAcademyDTO, academyDictDO);
this.baseMapper.insert(academyDictDO);
//账号
int count1 = administerMapper.selectCount(new QueryWrapper<AdministerDO>()
.lambda()
.eq(AdministerDO::getAccountName, addAcademyDTO.getAccountName()));
if (count1 > 0) {
throw new HttpException(10014);
}
AdministerDO administerDO = new AdministerDO();
BeanUtils.copyProperties(addAcademyDTO, administerDO);
administerDO.setRole(4);
administerDO.setStatus("1");
administerDO.setPassword("admin321");
administerDO.setUserName(academyDictDO.getAcademyName());
administerMapper.insert(administerDO);
//关联
AdministerAcademyMappingDO administerAcademyMappingDO = new AdministerAcademyMappingDO();
administerAcademyMappingDO.setAdministerId(administerDO.getId());
administerAcademyMappingDO.setAcademyId(academyDictDO.getId());
administerAcademyMappingMapper.insert(administerAcademyMappingDO);
return ConstantUtils.ADD_SUCCESS;
}
public String deleteAcademy(AcademyDictDO academyDictDO) {
this.baseMapper.deleteById(academyDictDO.getId());
List<AdministerAcademyMappingDO> administerAcademyMappingDOS = administerAcademyMappingMapper.selectList(new QueryWrapper<AdministerAcademyMappingDO>()
.lambda()
.eq(AdministerAcademyMappingDO::getAcademyId, academyDictDO.getId()));
administerAcademyMappingDOS.forEach(x -> {
administerAcademyMappingMapper.deleteById(x.getId());
administerMapper.deleteById(x.getAdministerId());
});
return ConstantUtils.DELETE_SUCCESS;
}
public String updateAcademy(AddAcademyDTO addAcademyDTO) {
AcademyDictDO academyDictDO = new AcademyDictDO();
BeanUtils.copyProperties(addAcademyDTO, academyDictDO);
this.updateById(academyDictDO);
//查看院校主账号
//账号
int count1 = administerMapper.selectCount(new QueryWrapper<AdministerDO>()
.lambda()
.eq(AdministerDO::getAccountName, addAcademyDTO.getAccountName())
.ne(AdministerDO::getId, addAcademyDTO.getId()));
if (count1 > 0) {
throw new HttpException(10014);
}
AdministerDO administerDO = this.baseMapper.mainAccount(addAcademyDTO.getId());
if (null != addAcademyDTO.getAccountName()) {
administerDO.setAccountName(addAcademyDTO.getAccountName());
}
if (null != addAcademyDTO.getTelephone()) {
administerDO.setTelephone(addAcademyDTO.getTelephone());
}
if (null != addAcademyDTO.getPassword()) {
administerDO.setPassword(addAcademyDTO.getPassword());
}
if (null != addAcademyDTO.getUserName()) {
administerDO.setUserName(addAcademyDTO.getUserName());
}
administerMapper.updateById(administerDO);
return ConstantUtils.SUCCESS_UPDATE;
}
public IPage academyAccount(AcademyAccountDTO academyAccountDTO) {
Page pager = new Page(academyAccountDTO.getPageNum(), academyAccountDTO.getPageSize());
IPage<AcademyAccountVO> academyAccountVOIPage = this.baseMapper.academyAccount(pager, academyAccountDTO.getAcademyName());
List<AcademyAccountVO> academyAccountVOS = academyAccountVOIPage.getRecords();
for (AcademyAccountVO aav : academyAccountVOS) {
//账户关联的院校
List<AcademyDictDO> academyDictDOS = this.baseMapper.accountAcademies(aav.getId());
aav.setAcademyDictDOS(academyDictDOS);
}
return academyAccountVOIPage;
}
public String addAcademyAccount(AddAcademyAccountDTO addAcademyAccountDTO) {
//账户
int count1 = administerMapper.selectCount(new QueryWrapper<AdministerDO>()
.lambda()
.eq(AdministerDO::getAccountName, addAcademyAccountDTO.getAccountName()));
if (count1 > 0) {
throw new HttpException(10014);
}
AdministerDO administerDO = new AdministerDO();
BeanUtils.copyProperties(addAcademyAccountDTO, administerDO);
administerDO.setRole(5);
administerMapper.insert(administerDO);
//映射关系
List<Long> academyIds = addAcademyAccountDTO.getAcademyIds();
for (Long academyId : academyIds) {
AdministerAcademyMappingDO administerAcademyMappingDO = new AdministerAcademyMappingDO();
administerAcademyMappingDO.setAcademyId(academyId);
administerAcademyMappingDO.setAdministerId(administerDO.getId());
administerAcademyMappingMapper.insert(administerAcademyMappingDO);
}
return ConstantUtils.ADD_SUCCESS;
}
public String deleteAcademyAccount(AdministerDO administerDO) {
administerMapper.deleteById(administerDO.getId());
List<AdministerAcademyMappingDO> administerAcademyMappingDOS = administerAcademyMappingMapper.selectList(new QueryWrapper<AdministerAcademyMappingDO>()
.lambda()
.eq(AdministerAcademyMappingDO::getAdministerId, administerDO.getId()));
for (AdministerAcademyMappingDO administerAcademyMappingDO : administerAcademyMappingDOS) {
administerAcademyMappingMapper.deleteById(administerAcademyMappingDO.getId());
}
return ConstantUtils.DELETE_SUCCESS;
}
public String updateAcademyAccount(AddAcademyAccountDTO addAcademyAccountDTO) {
//编辑人员信息
//账号
int count1 = administerMapper.selectCount(new QueryWrapper<AdministerDO>()
.lambda()
.eq(AdministerDO::getAccountName, addAcademyAccountDTO.getAccountName())
.ne(AdministerDO::getId, addAcademyAccountDTO.getId()));
if (count1 > 0) {
throw new HttpException(10014);
}
AdministerDO administerDO = new AdministerDO();
BeanUtils.copyProperties(addAcademyAccountDTO, administerDO);
administerMapper.updateById(administerDO);
//已关联院校信息
List<Long> oldIds = this.baseMapper.accountAcademyIds(addAcademyAccountDTO.getId());
//去旧加新
List<Long> newIds = addAcademyAccountDTO.getAcademyIds();
List<Long> newAcademyIds2 = new ArrayList<>();
for (Long lg : newIds) {
newAcademyIds2.add(lg);
}
newIds.removeAll(oldIds); //
if (newIds.size() > 0) {
for (Long lg : newIds) {
AdministerAcademyMappingDO administerAcademyMappingDO = new AdministerAcademyMappingDO();
administerAcademyMappingDO.setAdministerId(addAcademyAccountDTO.getId());
administerAcademyMappingDO.setAcademyId(lg);
administerAcademyMappingMapper.insert(administerAcademyMappingDO);
}
}
oldIds.removeAll(newAcademyIds2);
if (oldIds.size() > 0) {
for (Long lg : oldIds) {
administerAcademyMappingMapper.delete(new QueryWrapper<AdministerAcademyMappingDO>()
.lambda()
.eq(AdministerAcademyMappingDO::getAdministerId, addAcademyAccountDTO.getId())
.eq(AdministerAcademyMappingDO::getAcademyId, lg));
}
}
return ConstantUtils.SUCCESS_UPDATE;
}
}
package com.subsidy.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.subsidy.common.exception.HttpException;
import com.subsidy.model.AcademyMajorDictDO;
import com.subsidy.mapper.AcademyMajorDictMapper;
import com.subsidy.service.AcademyMajorDictService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.subsidy.util.ConstantUtils;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 专业字典表 服务实现类
* </p>
*
* @author Tuyp
* @since 2024-04-16
*/
@Service
public class AcademyMajorDictServiceImpl extends ServiceImpl<AcademyMajorDictMapper, AcademyMajorDictDO> implements AcademyMajorDictService {
public List<AcademyMajorDictDO> majors(AcademyMajorDictDO academyMajorDictDO) {
return this.baseMapper.majors(academyMajorDictDO.getCollegeId(),academyMajorDictDO.getMajor());
}
public String addMajor(AcademyMajorDictDO academyMajorDictDO) {
int count = this.baseMapper.selectCount(new QueryWrapper<AcademyMajorDictDO>()
.lambda()
.eq(AcademyMajorDictDO::getCollegeId, academyMajorDictDO.getCollegeId())
.eq(AcademyMajorDictDO::getMajor, academyMajorDictDO.getMajor()));
if (count > 0) {
throw new HttpException(24002);
}
this.baseMapper.insert(academyMajorDictDO);
return ConstantUtils.ADD_SUCCESS;
}
public String updateMajor(AcademyMajorDictDO academyMajorDictDO) {
int count = this.baseMapper.selectCount(new QueryWrapper<AcademyMajorDictDO>()
.lambda()
.eq(AcademyMajorDictDO::getCollegeId, academyMajorDictDO.getCollegeId())
.eq(AcademyMajorDictDO::getMajor, academyMajorDictDO.getMajor())
.ne(AcademyMajorDictDO::getId, academyMajorDictDO.getId()));
if (count > 0) {
throw new HttpException(24002);
}
this.baseMapper.updateById(academyMajorDictDO);
return ConstantUtils.SUCCESS_UPDATE;
}
public String deleteMajor(AcademyMajorDictDO academyMajorDictDO) {
this.baseMapper.deleteById(academyMajorDictDO.getId());
return ConstantUtils.DELETE_SUCCESS;
}
}
package com.subsidy.service.impl;
import com.subsidy.model.AdministerAcademyMappingDO;
import com.subsidy.mapper.AdministerAcademyMappingMapper;
import com.subsidy.service.AdministerAcademyMappingService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 管理员-院校映射表 服务实现类
* </p>
*
* @author Tuyp
* @since 2024-02-23
*/
@Service
public class AdministerAcademyMappingServiceImpl extends ServiceImpl<AdministerAcademyMappingMapper, AdministerAcademyMappingDO> implements AdministerAcademyMappingService {
}
package com.subsidy.service.impl;
import com.subsidy.model.AdministerLaborMappingDO;
import com.subsidy.mapper.AdministerLaborMappingMapper;
import com.subsidy.service.AdministerLaborMappingService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 管理员-伙伴映射表 服务实现类
* </p>
*
* @author Tuyp
* @since 2024-07-25
*/
@Service
public class AdministerLaborMappingServiceImpl extends ServiceImpl<AdministerLaborMappingMapper, AdministerLaborMappingDO> implements AdministerLaborMappingService {
}
......@@ -176,11 +176,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
.lambda()
.eq(AdministerDO::getAccountName, addAdministerDTO.getAccountName()));
int count1 = this.baseMapper.selectCount(new QueryWrapper<AdministerDO>()
.lambda()
.eq(AdministerDO::getTelephone, addAdministerDTO.getTelephone()));
if (count + count1 > 0) {
if (count > 0) {
throw new HttpException(20002);
}
......@@ -233,12 +229,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
.eq(AdministerDO::getAccountName, addAdministerDTO.getAccountName())
.ne(AdministerDO::getId, addAdministerDTO.getId()));
int count1 = this.baseMapper.selectCount(new QueryWrapper<AdministerDO>()
.lambda()
.eq(AdministerDO::getTelephone, addAdministerDTO.getTelephone())
.ne(AdministerDO::getId, addAdministerDTO.getId()));
if (count + count1 > 0) {
if (count > 0) {
throw new HttpException(20002);
}
AdministerDO administerDO = this.baseMapper.selectById(addAdministerDTO.getId());
......
......@@ -66,10 +66,15 @@ public class CompanyDictServiceImpl extends ServiceImpl<CompanyDictMapper, Compa
@Autowired
private CompanyMemberMappingMapper companyMemberMappingMapper;
@Autowired
private DepartmentDictMapper departmentDictMapper;
@Autowired
private ServiceFileTreeMapper serviceFileTreeMapper;
public IPage<OperatorsVO> operators(OperatorsDTO operatorsDTO) {
Page pager = new Page(operatorsDTO.getPageNum(), operatorsDTO.getPageSize());
// AdministerDO administerDO = administerMapper.selectById(operatorsDTO.getId());
IPage page = this.baseMapper.operators(pager, operatorsDTO.getCompanyName(), operatorsDTO.getFieldId(), operatorsDTO.getSuperviseName());
IPage page = this.baseMapper.operators(pager, operatorsDTO.getCompanyName(), operatorsDTO.getFieldId(), operatorsDTO.getSuperviseName());
List<OperatorsVO> operatorsVOS = page.getRecords();
for (OperatorsVO operatorsVO : operatorsVOS) {
//查看公司所在行业
......@@ -101,11 +106,24 @@ public class CompanyDictServiceImpl extends ServiceImpl<CompanyDictMapper, Compa
}
}
//先查一遍企业的唯一账号
AdministerDO administerDO1 = administerMapper.uniqueAdminister(companyDictDO.getId());
int count1 = administerMapper.selectCount(new QueryWrapper<AdministerDO>()
.lambda()
.eq(AdministerDO::getAccountName, addCompanyDTO.getAccountName())
.ne(AdministerDO::getId, administerDO1.getId()));
if (count1 > 0) {
throw new HttpException(10014);
}
//查找企业管理员
AdministerDO administerDO = administerMapper.selectOne(new QueryWrapper<AdministerDO>()
.lambda()
.eq(AdministerDO::getCompanyId,addCompanyDTO.getId())
.eq(AdministerDO::getRole,3));
.lambda()
.eq(AdministerDO::getCompanyId, addCompanyDTO.getId())
.eq(AdministerDO::getRole, 3));
if (null != administerDO) {
if (StringUtils.isNotBlank(addCompanyDTO.getAccountName())) {
administerDO.setAccountName(addCompanyDTO.getAccountName());
......@@ -144,11 +162,19 @@ public class CompanyDictServiceImpl extends ServiceImpl<CompanyDictMapper, Compa
BeanUtils.copyProperties(addCompanyDTO, companyDictDO);
this.baseMapper.insert(companyDictDO);
int count1 = administerMapper.selectCount(new QueryWrapper<AdministerDO>()
.lambda()
.eq(AdministerDO::getAccountName, addCompanyDTO.getAccountName()));
if (count1 > 0) {
throw new HttpException(10014);
}
AdministerDO administerDO = new AdministerDO();
BeanUtils.copyProperties(addCompanyDTO,administerDO);
BeanUtils.copyProperties(addCompanyDTO, administerDO);
administerDO.setCompanyId(companyDictDO.getId());
administerDO.setRole(3);
administerDO.setStatus("1");
administerDO.setUserName(companyDictDO.getCompanyName());
administerDO.setPassword("admin321");
administerMapper.insert(administerDO);
......@@ -170,6 +196,13 @@ public class CompanyDictServiceImpl extends ServiceImpl<CompanyDictMapper, Compa
classHourDictDO2.setRepeatTime(3);
classHourDictMapper.insert(classHourDictDO2);
//添加默认部门 名称为公司名称
DepartmentDictDO departmentDictDO = new DepartmentDictDO();
departmentDictDO.setCompanyId(companyDictDO.getId());
departmentDictDO.setDepartmentName(companyDictDO.getCompanyName());
departmentDictDO.setFullName(companyDictDO.getCompanyName());
departmentDictMapper.insert(departmentDictDO);
//行业
List<Long> fields = addCompanyDTO.getField();
for (Long lg : fields) {
......@@ -217,6 +250,22 @@ public class CompanyDictServiceImpl extends ServiceImpl<CompanyDictMapper, Compa
classTypeDictDO.setClassType("补贴培训");
classTypeDictMapper.insert(classTypeDictDO);
ServiceFileTreeDO serviceFileTreeDO = new ServiceFileTreeDO();
serviceFileTreeDO.setCompanyId(companyDictDO.getId());
serviceFileTreeDO.setTreeName("业务合同");
serviceFileTreeDO.setServiceId(1L);
serviceFileTreeMapper.insert(serviceFileTreeDO);
serviceFileTreeDO.setCompanyId(companyDictDO.getId());
serviceFileTreeDO.setServiceId(4L);
serviceFileTreeMapper.insert(serviceFileTreeDO);
serviceFileTreeDO.setTreeName("业务材料");
serviceFileTreeMapper.insert(serviceFileTreeDO);
serviceFileTreeDO.setServiceId(1L);
serviceFileTreeMapper.insert(serviceFileTreeDO);
return ConstantUtils.ADD_SUCCESS;
}
......@@ -227,7 +276,7 @@ public class CompanyDictServiceImpl extends ServiceImpl<CompanyDictMapper, Compa
IPage<GetCompanyMembersVO> companyMembersVOIPage = this.baseMapper.getCompanyMembers(pager, getCompanyMembersDTO.getCompanyId(), getCompanyMembersDTO.getUserName(), getCompanyMembersDTO.getMemberStatus());
List<GetCompanyMembersVO> records = companyMembersVOIPage.getRecords();
for (GetCompanyMembersVO gcmv : records){
for (GetCompanyMembersVO gcmv : records) {
//历史带过的企业
List<MemberCompanyVO> memberCompanyVOS = companyMemberMappingMapper.memberCompanys(gcmv.getId());
......@@ -239,7 +288,7 @@ public class CompanyDictServiceImpl extends ServiceImpl<CompanyDictMapper, Compa
public void exportCompanyMembers(GetCompanyMembersDTO getCompanyMembersDTO) {
Page pager = new Page(1, -1);
List<GetCompanyMembersVO> getCompanyMembersVOS = this.baseMapper.getCompanyMembers(pager, getCompanyMembersDTO.getCompanyId(), getCompanyMembersDTO.getUserName(),getCompanyMembersDTO.getMemberStatus()).getRecords();
List<GetCompanyMembersVO> getCompanyMembersVOS = this.baseMapper.getCompanyMembers(pager, getCompanyMembersDTO.getCompanyId(), getCompanyMembersDTO.getUserName(), getCompanyMembersDTO.getMemberStatus()).getRecords();
ExcelUtil.writeExcel(getCompanyMembersVOS, GetCompanyMembersVO.class);
}
......
package com.subsidy.service.impl;
import com.subsidy.model.LaborGroupDictDO;
import com.subsidy.mapper.LaborGroupDictMapper;
import com.subsidy.service.LaborGroupDictService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 伙伴群组字典表 服务实现类
* </p>
*
* @author Tuyp
* @since 2024-07-29
*/
@Service
public class LaborGroupDictServiceImpl extends ServiceImpl<LaborGroupDictMapper, LaborGroupDictDO> implements LaborGroupDictService {
}
package com.subsidy.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.subsidy.common.exception.HttpException;
import com.subsidy.dto.academy.AddAcademyAccountDTO;
import com.subsidy.dto.labor.*;
import com.subsidy.mapper.*;
import com.subsidy.model.*;
import com.subsidy.service.LaborServiceDictService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.subsidy.util.ConstantUtils;
import com.subsidy.vo.labor.LaborAccountVO;
import com.subsidy.vo.labor.LaborsVO;
import com.subsidy.vo.labor.TalentManagementVO;
import com.subsidy.vo.member.DetailVO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
/**
* <p>
* 劳务公司字典表 服务实现类
* </p>
*
* @author Tuyp
* @since 2024-07-25
*/
@Service
public class LaborServiceDictServiceImpl extends ServiceImpl<LaborServiceDictMapper, LaborServiceDictDO> implements LaborServiceDictService {
@Autowired
private AdministerMapper administerMapper;
@Autowired
private AdministerLaborMappingMapper administerLaborMappingMapper;
@Autowired
private LaborGroupDictMapper laborGroupDictMapper;
@Autowired
private ProjectMemberMappingMapper projectMemberMappingMapper;
public IPage<LaborsVO> labors(LaborsDTO laborsDTO) {
Page pager = new Page(laborsDTO.getPageNum(), laborsDTO.getPageSize());
return this.baseMapper.labors(pager, laborsDTO.getLaborServiceName());
}
public void addLabor(AddLaborDTO addLaborDTO) {
//伙伴
LaborServiceDictDO laborServiceDictDO = new LaborServiceDictDO();
BeanUtils.copyProperties(addLaborDTO, laborServiceDictDO);
this.baseMapper.insert(laborServiceDictDO);
//账号
AdministerDO administerDO = new AdministerDO();
BeanUtils.copyProperties(addLaborDTO, administerDO);
administerDO.setLaborId(laborServiceDictDO.getId());
administerDO.setPassword("admin321");
administerDO.setRole(6);
administerDO.setUserName(addLaborDTO.getLaborServiceName());
administerMapper.insert(administerDO);
LaborGroupDictDO laborGroupDictDO = new LaborGroupDictDO();
laborGroupDictDO.setGroupName(laborServiceDictDO.getLaborServiceName());
laborGroupDictDO.setLaborId(laborServiceDictDO.getId());
laborGroupDictMapper.insert(laborGroupDictDO);
}
@Transactional(rollbackFor = Exception.class)
public void deleteLabor(LaborServiceDictDO laborServiceDictDO) {
this.baseMapper.deleteById(laborServiceDictDO.getId());
AdministerDO administerDO = administerMapper.selectOne(new QueryWrapper<AdministerDO>()
.lambda()
.eq(AdministerDO::getLaborId, laborServiceDictDO.getId()));
administerMapper.deleteById(administerDO.getId());
}
public void updateLabor(AddLaborDTO addLaborDTO) {
//伙伴
LaborServiceDictDO laborServiceDictDO = new LaborServiceDictDO();
BeanUtils.copyProperties(addLaborDTO, laborServiceDictDO);
this.baseMapper.updateById(laborServiceDictDO);
//账号
AdministerDO administerDO = administerMapper.selectOne(new QueryWrapper<AdministerDO>()
.lambda()
.eq(AdministerDO::getLaborId, laborServiceDictDO.getId()));
if (StringUtils.isNotBlank(addLaborDTO.getAccountName())) {
administerDO.setAccountName(addLaborDTO.getAccountName());
}
if (StringUtils.isNotBlank(addLaborDTO.getPassword())) {
administerDO.setPassword(addLaborDTO.getPassword());
}
if (StringUtils.isNotBlank(addLaborDTO.getLaborServiceName())) {
administerDO.setUserName(addLaborDTO.getLaborServiceName());
}
administerMapper.updateById(administerDO);
}
public IPage<LaborAccountVO> laborAccount(LaborAccountDTO laborAccountDTO) {
Page pager = new Page(laborAccountDTO.getPageNum(), laborAccountDTO.getPageSize());
IPage<LaborAccountVO> laborAccountVOIPage = this.baseMapper.laborAccount(pager, laborAccountDTO.getLaborServiceName());
List<LaborAccountVO> laborAccountVOS = laborAccountVOIPage.getRecords();
for (LaborAccountVO laborAccountVO : laborAccountVOS) {
//关联伙伴
List<LaborServiceDictDO> laborServiceDictDOS = this.baseMapper.relateLabors(laborAccountVO.getId());
laborAccountVO.setLaborServiceDictDOS(laborServiceDictDOS);
}
return laborAccountVOIPage;
}
public String addLaborAccount(AddLaborAccountDTO addLaborAccountDTO) {
//账户
int count1 = administerMapper.selectCount(new QueryWrapper<AdministerDO>()
.lambda()
.eq(AdministerDO::getAccountName, addLaborAccountDTO.getAccountName()));
if (count1 > 0) {
throw new HttpException(10014);
}
AdministerDO administerDO = new AdministerDO();
BeanUtils.copyProperties(addLaborAccountDTO, administerDO);
administerDO.setRole(7);
administerMapper.insert(administerDO);
//映射关系
List<Long> laborIds = addLaborAccountDTO.getLaborIds();
for (Long laborId : laborIds) {
AdministerLaborMappingDO administerLaborMappingDO = new AdministerLaborMappingDO();
administerLaborMappingDO.setLaborId(laborId);
administerLaborMappingDO.setAdministerId(administerDO.getId());
administerLaborMappingMapper.insert(administerLaborMappingDO);
}
return ConstantUtils.ADD_SUCCESS;
}
public String deleteLaborAccount(AdministerDO administerDO) {
administerMapper.deleteById(administerDO.getId());
List<AdministerLaborMappingDO> administerLaborMappingDOS = administerLaborMappingMapper.selectList(new QueryWrapper<AdministerLaborMappingDO>()
.lambda()
.eq(AdministerLaborMappingDO::getAdministerId, administerDO.getId()));
for (AdministerLaborMappingDO administerLaborMappingDO : administerLaborMappingDOS) {
administerLaborMappingMapper.deleteById(administerLaborMappingDO.getId());
}
return ConstantUtils.DELETE_SUCCESS;
}
public String updateLaborAccount(AddLaborAccountDTO addLaborAccountDTO) {
//编辑人员信息
//账号
int count1 = administerMapper.selectCount(new QueryWrapper<AdministerDO>()
.lambda()
.eq(AdministerDO::getAccountName, addLaborAccountDTO.getAccountName())
.ne(AdministerDO::getId, addLaborAccountDTO.getId()));
if (count1 > 0) {
throw new HttpException(10014);
}
AdministerDO administerDO = new AdministerDO();
BeanUtils.copyProperties(addLaborAccountDTO, administerDO);
administerMapper.updateById(administerDO);
//已关联院校信息
List<Long> oldIds = this.baseMapper.accountLabors(addLaborAccountDTO.getId());
//去旧加新
List<Long> newIds = addLaborAccountDTO.getLaborIds();
List<Long> newAcademyIds2 = new ArrayList<>();
for (Long lg : newIds) {
newAcademyIds2.add(lg);
}
newIds.removeAll(oldIds); //
if (newIds.size() > 0) {
for (Long lg : newIds) {
AdministerLaborMappingDO administerLaborMappingDO = new AdministerLaborMappingDO();
administerLaborMappingDO.setAdministerId(addLaborAccountDTO.getId());
administerLaborMappingDO.setLaborId(lg);
administerLaborMappingMapper.insert(administerLaborMappingDO);
}
}
oldIds.removeAll(newAcademyIds2);
if (oldIds.size() > 0) {
for (Long lg : oldIds) {
administerLaborMappingMapper.delete(new QueryWrapper<AdministerLaborMappingDO>()
.lambda()
.eq(AdministerLaborMappingDO::getAdministerId, addLaborAccountDTO.getId())
.eq(AdministerLaborMappingDO::getLaborId, lg));
}
}
return ConstantUtils.SUCCESS_UPDATE;
}
public IPage<TalentManagementVO> talentManagement(TalentManagementDTO talentManagementDTO) {
Page pager = new Page(talentManagementDTO.getPageNum(), talentManagementDTO.getPageSize());
return this.baseMapper.talentManagement(pager, talentManagementDTO.getLaborId(), talentManagementDTO.getUserName());
}
public List<DetailVO> detail(ProjectMemberMappingDO projectMemberMappingDO) {
return projectMemberMappingMapper.detail(projectMemberMappingDO.getMemberId());
}
}
package com.subsidy.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.subsidy.dto.member.AcademyMembersDTO;
import com.subsidy.model.MemberDO;
import com.subsidy.mapper.MemberMapper;
import com.subsidy.service.MemberService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.subsidy.vo.member.AcademyMembersVO;
import org.springframework.stereotype.Service;
/**
......@@ -17,4 +21,9 @@ import org.springframework.stereotype.Service;
@Service
public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> implements MemberService {
public IPage<AcademyMembersVO> academyMembers(AcademyMembersDTO academyMembersDTO) {
Page pager = new Page(academyMembersDTO.getPageNum(), academyMembersDTO.getPageSize());
return this.baseMapper.academyMembers(pager,academyMembersDTO.getUserName(),academyMembersDTO.getPracticeStatus(),academyMembersDTO.getAcademyId());
}
}
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.subsidy.common.exception.HttpException;
import com.subsidy.dto.product.AllProductsDTO;
import com.subsidy.dto.product.ChangeOrderDTO;
import com.subsidy.model.ProductDictDO;
import com.subsidy.mapper.ProductDictMapper;
import com.subsidy.service.ProductDictService;
......@@ -12,6 +13,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.subsidy.util.ConstantUtils;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 产品管理字典表 服务实现类
......@@ -26,7 +29,7 @@ public class ProductDictServiceImpl extends ServiceImpl<ProductDictMapper, Produ
public IPage<ProductDictDO> allProducts(AllProductsDTO allProductsDTO) {
Page pager = new Page(allProductsDTO.getPageNum(), allProductsDTO.getPageSize());
return this.baseMapper.allProducts(pager, allProductsDTO.getProductName());
return this.baseMapper.allProducts(pager, allProductsDTO.getProductName(), allProductsDTO.getProductType());
}
public String addProduct(ProductDictDO productDictDO) {
......@@ -51,4 +54,22 @@ public class ProductDictServiceImpl extends ServiceImpl<ProductDictMapper, Produ
return ConstantUtils.SUCCESS_UPDATE;
}
public String changeOrder(ChangeOrderDTO changeOrderDTO) {
List<Long> productDictDOS = changeOrderDTO.getProductDictDOS();
int i = 0;
for (Long productDictDO : productDictDOS) {
this.baseMapper.updateOrderNo(productDictDO, i++);
}
return ConstantUtils.SUCCESS_UPDATE;
}
public List<ProductDictDO> frontPage(ProductDictDO productDictDO) {
return this.baseMapper.selectList(new QueryWrapper<ProductDictDO>()
.lambda()
.eq(ProductDictDO::getFrontPage, 1)
.eq(ProductDictDO::getProductType, productDictDO.getProductType())
.orderByDesc(ProductDictDO::getCreateDate));
}
}
package com.subsidy.service.impl;
import com.subsidy.model.ProjectMemberMappingDO;
import com.subsidy.mapper.ProjectMemberMappingMapper;
import com.subsidy.service.ProjectMemberMappingService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 项目人员映射表 服务实现类
* </p>
*
* @author Tuyp
* @since 2024-07-29
*/
@Service
public class ProjectMemberMappingServiceImpl extends ServiceImpl<ProjectMemberMappingMapper, ProjectMemberMappingDO> implements ProjectMemberMappingService {
}
package com.subsidy.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.subsidy.dto.company.CompanyFilesDTO;
import com.subsidy.mapper.ServiceFileTreeMapper;
import com.subsidy.model.ServiceCompanyFilesDO;
import com.subsidy.mapper.ServiceCompanyFilesMapper;
import com.subsidy.model.ServiceFileTreeDO;
import com.subsidy.service.ServiceCompanyFilesService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.subsidy.util.ConstantUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
......@@ -23,10 +28,27 @@ import java.util.List;
@Service
public class ServiceCompanyFilesServiceImpl extends ServiceImpl<ServiceCompanyFilesMapper, ServiceCompanyFilesDO> implements ServiceCompanyFilesService {
@Autowired
private ServiceFileTreeMapper serviceFileTreeMapper;
public IPage<ServiceCompanyFilesDO> companyFiles(CompanyFilesDTO companyFilesDTO) {
Page pager = new Page(companyFilesDTO.getPageNum(), companyFilesDTO.getPageSize());
return this.baseMapper.companyFiles(pager,companyFilesDTO.getFileType(),companyFilesDTO.getServiceCompanyId(), companyFilesDTO.getFileName());
List<Long> treeIds = new ArrayList<>();
treeIds.add(companyFilesDTO.getTreeId());
ServiceFileTreeDO serviceFileTreeDO = serviceFileTreeMapper.selectById(companyFilesDTO.getTreeId());
if (null == serviceFileTreeDO.getParentId()){
//找出二级节点
List<ServiceFileTreeDO> serviceFileTreeDOS = serviceFileTreeMapper.selectList(new QueryWrapper<ServiceFileTreeDO>()
.lambda()
.eq(ServiceFileTreeDO::getParentId,serviceFileTreeDO.getId()));
for (ServiceFileTreeDO serviceFileTreeDO1 : serviceFileTreeDOS){
treeIds.add(serviceFileTreeDO1.getId());
}
}
return this.baseMapper.companyFiles(pager,treeIds, companyFilesDTO.getFileName());
}
public String deleteFile(ServiceCompanyFilesDO serviceCompanyFilesDO) {
......
package com.subsidy.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.subsidy.common.exception.HttpException;
import com.subsidy.mapper.ServiceCompanyFilesMapper;
import com.subsidy.model.ServiceCompanyFilesDO;
import com.subsidy.model.ServiceFileTreeDO;
import com.subsidy.mapper.ServiceFileTreeMapper;
import com.subsidy.service.ServiceFileTreeService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.subsidy.util.ConstantUtils;
import com.subsidy.vo.tree.TreesVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* <p>
* 服务实现类
* </p>
*
* @author Tuyp
* @since 2024-04-08
*/
@Service
public class ServiceFileTreeServiceImpl extends ServiceImpl<ServiceFileTreeMapper, ServiceFileTreeDO> implements ServiceFileTreeService {
public List<TreesVO> trees(ServiceFileTreeDO serviceFileTreeDO) {
List<TreesVO> result = new ArrayList<>();
List<ServiceFileTreeDO> serviceFileTreeDOS = this.baseMapper.selectList(new QueryWrapper<ServiceFileTreeDO>()
.lambda()
.eq(ServiceFileTreeDO::getCompanyId, serviceFileTreeDO.getCompanyId())
.eq(ServiceFileTreeDO::getServiceId, serviceFileTreeDO.getServiceId())
.isNull(ServiceFileTreeDO::getParentId));
for (ServiceFileTreeDO sftd : serviceFileTreeDOS) {
TreesVO treesVO = new TreesVO();
treesVO.setId(sftd.getId());
treesVO.setTreeName(sftd.getTreeName());
List<ServiceFileTreeDO> serviceFileTreeDOList = this.baseMapper.selectList(new QueryWrapper<ServiceFileTreeDO>()
.lambda()
.eq(ServiceFileTreeDO::getParentId, sftd.getId()));
List<TreesVO> resultTmp = new ArrayList<>();
for (ServiceFileTreeDO sftd2 : serviceFileTreeDOList) {
TreesVO treesVO1 = new TreesVO();
treesVO1.setId(sftd2.getId());
treesVO1.setTreeName(sftd2.getTreeName());
treesVO1.setParentId(sftd.getId());
resultTmp.add(treesVO1);
}
treesVO.setTreesVOS(resultTmp);
result.add(treesVO);
}
return result;
}
public String addTree(ServiceFileTreeDO serviceFileTreeDO) {
//查看当前节点下有没有重名的
int count = this.baseMapper.selectCount(new QueryWrapper<ServiceFileTreeDO>()
.lambda()
.eq(ServiceFileTreeDO::getCompanyId, serviceFileTreeDO.getCompanyId())
.eq(ServiceFileTreeDO::getParentId, serviceFileTreeDO.getParentId())
.eq(ServiceFileTreeDO::getTreeName, serviceFileTreeDO.getTreeName())
.eq(ServiceFileTreeDO::getServiceId, serviceFileTreeDO.getServiceId()));
if (count > 0) {
throw new HttpException(40001);
}
this.baseMapper.insert(serviceFileTreeDO);
return ConstantUtils.ADD_SUCCESS;
}
public String updateTree(ServiceFileTreeDO serviceFileTreeDO) {
ServiceFileTreeDO serviceFileTreeDO1 = this.baseMapper.selectById(serviceFileTreeDO.getId());
//查看当前节点下有没有重名的
int count = this.baseMapper.selectCount(new QueryWrapper<ServiceFileTreeDO>()
.lambda()
.eq(ServiceFileTreeDO::getCompanyId, serviceFileTreeDO1.getCompanyId())
.eq(ServiceFileTreeDO::getParentId, serviceFileTreeDO1.getParentId())
.eq(ServiceFileTreeDO::getTreeName, serviceFileTreeDO.getTreeName())
.eq(ServiceFileTreeDO::getServiceId, serviceFileTreeDO1.getServiceId())
.ne(ServiceFileTreeDO::getId, serviceFileTreeDO.getId()));
if (count > 0) {
throw new HttpException(40001);
}
this.baseMapper.updateById(serviceFileTreeDO);
return ConstantUtils.SUCCESS_UPDATE;
}
public String deleteTree(ServiceFileTreeDO serviceFileTreeDO) {
ServiceFileTreeDO serviceFileTreeDO1 = this.baseMapper.selectById(serviceFileTreeDO.getId());
this.baseMapper.deleteById(serviceFileTreeDO.getId());
List<Long> deleteIds = new ArrayList<>();
deleteIds.add(serviceFileTreeDO.getId());
//如果是一级目录的话,要删除对应的二级目录
if (null == serviceFileTreeDO1.getParentId()) {
//找出二级节点
List<ServiceFileTreeDO> serviceFileTreeDOS = this.baseMapper.selectList(new QueryWrapper<ServiceFileTreeDO>()
.lambda()
.eq(ServiceFileTreeDO::getParentId, serviceFileTreeDO.getId()));
for (ServiceFileTreeDO sftd : serviceFileTreeDOS) {
deleteIds.add(sftd.getId());
}
// 删除该目录下及子目录下的文件
this.baseMapper.delete(new QueryWrapper<ServiceFileTreeDO>()
.lambda()
.in(ServiceFileTreeDO::getId, deleteIds));
}
return ConstantUtils.DELETE_SUCCESS;
}
}
package com.subsidy.vo.academy;
import lombok.Data;
@Data
public class AcademiesVO {
private Long academyId;
private String academyName;
private String shortName;
private String location;
private String academyType;
private String accountName;
private String password;
private String userName;
private String telephone;
}
package com.subsidy.vo.academy;
import com.subsidy.model.AcademyDictDO;
import lombok.Data;
import java.util.List;
@Data
public class AcademyAccountVO {
private Long id;
private String userName;
private String password;
private String telephone;
private String remark;
private String role;
private String accountName;
private List<AcademyDictDO> academyDictDOS;
}
package com.subsidy.vo.academy;
import lombok.Data;
@Data
public class AllAcademyMembersVO {
}
package com.subsidy.vo.labor;
import com.subsidy.model.LaborServiceDictDO;
import lombok.Data;
import java.util.List;
@Data
public class LaborAccountVO {
private Long id;
private Long laborId;
private String userName;
private String password;
private String telephone;
private String remark;
private String role;
private String accountName;
private List<LaborServiceDictDO> laborServiceDictDOS;
}
package com.subsidy.vo.labor;
import lombok.Data;
@Data
public class LaborsVO {
private Long id;
private String laborServiceName;
private String shortName;
private String location;
private String serviceCode;
private String accountName;
private String password;
}
package com.subsidy.vo.labor;
import lombok.Data;
@Data
public class TalentManagementVO {
private Long id;
private String userName;
private String gender;
private String telephone;
private String idCard;
private String email;
private String payrollAccount;
private String bank;
private String wechatStatus;
}
package com.subsidy.vo.member;
import lombok.Data;
@Data
public class AcademyMembersVO {
private Long id;
private String userName;
private String status;
private String accountName;
private String gender;
private String telephone;
private String idCard;
private String email;
private String college;
private String major;
private String practiceStatus;
private String enrollmentYear;
}
package com.subsidy.vo.member;
import lombok.Data;
@Data
public class DetailVO {
private Long id;
private String projectName;
private String jobName;
private String hireTime;
}
package com.subsidy.vo.tree;
import lombok.Data;
import java.util.List;
@Data
public class TreesVO {
private Long id;
private Long parentId;
private String treeName;
private List<TreesVO> treesVOS;
}
# 环境配置
spring.profiles.active=prod
# 环境配置 平台端
spring.profiles.active=dev
#和CPU数
spring.server.acceptorThreadCount=600
spring.server.minSpareThreads=100
......@@ -11,6 +11,10 @@ spring.server.connectionTimeout=20000
spring.server.protocol=org.apache.coyote.http11.Http11AprProtocol
spring.server.redirectPort=8443
spring.server.compression=on
#jmx配置
spring.jmx.enabled=true
spring.jmx.default-domain=116.62.57.92
spring.jmx.port=1099
#文件请求大小
spring.server.MaxFileSize=300MB
spring.server.MaxRequestSize=500MB
......@@ -78,3 +82,4 @@ polyv.userId=b8f2d3bfdc
polyv.appId=g3lrxnzd75
polyv.appSecret=ef9cdcbbb9184b61aca301ba8114d570
polyv.secretKey=03sqxr97fo
......@@ -23,6 +23,7 @@ meishu.code-message[10026]=姓名或身份证号格式不正确
meishu.code-message[10027]=该手机号已注册
meishu.code-message[10028]=该成员已在其他公司入职
meishu.code-message[10029]=密码输入错误
meishu.code-message[10030]=该院校已存在
meishu.code-message[20001]=该课程已存在
meishu.code-message[20002]=该成员已存在
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.subsidy.mapper.AcademyCollegeDictMapper">
<select id="allCollege" resultType="com.subsidy.model.AcademyCollegeDictDO">
SELECT
*
FROM
academy_college_dict t
WHERE
t.delete_date IS NULL
and t.academy_id = #{academyId}
<if test="college != null and college != ''">
AND t.college like concat('%',#{college} ,'%')
</if>
</select>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.subsidy.mapper.AcademyDictMapper">
<select id="academies" resultType="com.subsidy.vo.academy.AcademiesVO">
SELECT distinct
t2.id AS academy_id,
t2.academy_name,
t2.short_name,
t2.location,
t2.academy_type,
t4.account_name,
t4.PASSWORD,
t4.user_name,
t4.telephone
FROM
academy_dict t2
LEFT JOIN administer_academy_mapping t5 ON t2.id = t5.academy_id
LEFT JOIN administer t4 ON t4.id = t5.administer_id
WHERE
t2.delete_date IS NULL
AND t5.delete_date IS NULL
AND t4.delete_date IS NULL
AND role =4
<if test="academyName != null and academyName != ''">
and t2.academy_name like concat('%',#{academyName} ,'%')
</if>
</select>
<select id="academyAccount" resultType="com.subsidy.vo.academy.AcademyAccountVO">
SELECT distinct
t2.id,
t2.user_name,
t2.`password`,
t2.telephone,
t2.remark,
t2.role,
t2.account_name
FROM
administer t2
LEFT JOIN administer_academy_mapping t1 ON t2.id = t1.administer_id
LEFT JOIN academy_dict t3 ON t1.academy_id = t3.id
WHERE
t2.delete_date IS NULL
AND t1.delete_date IS NULL
AND t3.delete_date IS NULL
AND t2.role = 5
<if test="academyName != null and academyName != ''">
and (t3.academy_name like concat('%',#{academyName} ,'%') or t2.account_name like concat('%',#{academyName}
,'%') )
</if>
</select>
<select id="accountAcademies" parameterType="long" resultType="com.subsidy.model.AcademyDictDO">
SELECT
t3.*
FROM
administer_academy_mapping t1
LEFT JOIN academy_dict t3 ON t1.academy_id = t3.id
WHERE
t1.delete_date IS NULL
AND t3.delete_date IS NULL
and t1.administer_id = #{administerId}
</select>
<select id="accountAcademyIds" parameterType="long" resultType="long">
SELECT
t3.id
FROM
administer_academy_mapping t1
LEFT JOIN academy_dict t3 ON t1.academy_id = t3.id
WHERE
t1.delete_date IS NULL
AND t3.delete_date IS NULL
and t1.administer_id = #{administerId}
</select>
<select id="mainAccount" parameterType="long" resultType="com.subsidy.model.AdministerDO">
SELECT
t2.*
FROM
administer_academy_mapping t
LEFT JOIN administer t2 ON t.administer_id = t2.id
AND t2.role = 4
where t.delete_date is null
and t2.delete_date is null
and t.academy_id = #{academyId}
</select>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.subsidy.mapper.AcademyMajorDictMapper">
<select id="majors" resultType="com.subsidy.model.AcademyMajorDictDO">
SELECT
*
FROM
academy_major_dict t
where t.delete_date is null
and t.college_id = #{collegeId}
<if test="major != null and major != ''">
and t.major like concat('%',#{major} ,'%')
</if>
</select>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.subsidy.mapper.AdministerAcademyMappingMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.subsidy.model.AdministerAcademyMappingDO">
<id column="id" property="id" />
<result column="create_date" property="createDate" />
<result column="update_date" property="updateDate" />
<result column="delete_date" property="deleteDate" />
<result column="administer_id" property="administerId" />
<result column="academy_id" property="academyId" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
create_date,
update_date,
delete_date,
id, administer_id, academy_id
</sql>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.subsidy.mapper.AdministerLaborMappingMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.subsidy.model.AdministerLaborMappingDO">
<id column="id" property="id" />
<result column="create_date" property="createDate" />
<result column="update_date" property="updateDate" />
<result column="delete_date" property="deleteDate" />
<result column="administer_id" property="administerId" />
<result column="labor_id" property="laborId" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
create_date,
update_date,
delete_date,
id, administer_id, labor_id
</sql>
</mapper>
......@@ -118,6 +118,18 @@
<if test="id !=null and id !=''">
and t.administer_id = #{id}
</if>
</select>
<select id="uniqueAdminister" parameterType="long" resultType="com.subsidy.model.AdministerDO">
SELECT
t.*
FROM
administer t
LEFT JOIN administer_company_mapping t2 ON t.id = t2.administer_id
WHERE
t.delete_date IS NULL
AND t2.delete_date IS NULL
AND t2.company_id = #{companyId}
AND t.role =3
</select>
</mapper>
......@@ -4,8 +4,13 @@
<select id="operators" resultType="com.subsidy.dto.company.OperatorsVO">
SELECT
distinct
t2.id as companyId,
t1.*,
t2.account_name,
t2.`password`
FROM
(
SELECT DISTINCT
t2.id AS companyId,
t2.banner,
t2.short_name,
t2.company_name,
......@@ -13,25 +18,37 @@
t2.address,
t2.supervise_name,
t2.company_code,
t2.area_name,
t4.password,
t4.account_name
t2.area_name
FROM
company_dict t2
left join company_field_mapping t3 on t2.id = t3.company_id
left join administer t4 on t2.id = t4.company_id and role = 3
LEFT JOIN company_field_mapping t3 ON t2.id = t3.company_id
WHERE
t2.delete_date is null
and t3.delete_date is null
t2.delete_date IS NULL
AND t3.delete_date IS NULL
<if test="companyName != null and companyName != ''">
and t2.company_name like concat('%',#{companyName} ,'%')
</if>
) t1
LEFT JOIN (
SELECT
t.company_id,
t2.account_name,
t2.`password`
FROM
administer_company_mapping t
LEFT JOIN administer t2 ON t.administer_id = t2.id
WHERE
t2.role = 3
and t.delete_date IS NULL
and t2.delete_date IS NULL
) t2 ON t1.companyId = t2.company_id
<if test="fieldId != null and fieldId != ''">
and t3.field_id = #{fieldId}
and t1.field_id = #{fieldId}
</if>
<if test="superviseName != null and superviseName != ''">
and t2.supervise_name =#{superviseName}
and t1.supervise_name =#{superviseName}
</if>
order by t1.companyId
</select>
......@@ -71,6 +88,7 @@
<if test="memberStatus == 0">
and ( t5.member_status = #{memberStatus} or t5.member_status is null)
</if>
and t.member_type = 2
</select>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.subsidy.mapper.LaborGroupDictMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.subsidy.model.LaborGroupDictDO">
<id column="id" property="id" />
<result column="create_date" property="createDate" />
<result column="update_date" property="updateDate" />
<result column="delete_date" property="deleteDate" />
<result column="labor_id" property="laborId" />
<result column="parent_id" property="parentId" />
<result column="group_name" property="groupName" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
create_date,
update_date,
delete_date,
id, labor_id, parent_id, group_name
</sql>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.subsidy.mapper.LaborServiceDictMapper">
<select id="labors" resultType="com.subsidy.vo.labor.LaborsVO">
SELECT
t.id,
t.labor_service_name,
t.short_name,
t.location,
t.service_code,
t2.account_name,
t2.`password`
FROM
labor_service_dict t
LEFT JOIN administer t2 ON t.id = t2.labor_id
WHERE
t.delete_date IS NULL
AND t2.delete_date IS NULL
<if test="laborServiceName != null and laborServiceName != ''">
AND t.labor_service_name like concat('%',#{laborServiceName} ,'%')
</if>
</select>
<select id="laborAccount" resultType="com.subsidy.vo.labor.LaborAccountVO">
SELECT distinct
t2.id,
t2.user_name,
t2.`password`,
t2.telephone,
t2.remark,
t2.role,
t2.account_name
FROM
administer t2
LEFT JOIN administer_labor_mapping t1 ON t2.id = t1.administer_id
LEFT JOIN labor_service_dict t3 ON t1.labor_id = t3.id
WHERE
t2.delete_date IS NULL
AND t1.delete_date IS NULL
AND t3.delete_date IS NULL
AND t2.role = 7
<if test="accountName != null and accountName != ''">
and (t3.labor_service_name like concat('%',#{accountName} ,'%') or t2.account_name like concat('%',#{accountName},'%') )
</if>
</select>
<select id="relateLabors" parameterType="long" resultType="com.subsidy.model.LaborServiceDictDO">
SELECT
t2.id,
t2.labor_service_name
FROM
administer_labor_mapping t
LEFT JOIN labor_service_dict t2 ON t.labor_id = t2.id
WHERE
t.delete_date IS NULL
AND t2.delete_date IS NULL
AND t.administer_id = #{administerId}
</select>
<select id="accountLabors" parameterType="long" resultType="long">
SELECT
t.labor_id
FROM
administer_labor_mapping t
WHERE
t.delete_date IS NULL
AND t.administer_id = #{administerId}
</select>
<select id="talentManagement" parameterType="long" resultType="com.subsidy.vo.labor.TalentManagementVO">
SELECT
t3.id,
t3.gender,
t3.user_name,
t3.telephone,
t3.id_card,
t3.email,
t3.payroll_account,
t3.bank,
IF
( t3.open_id IS NULL, '未绑定', '已绑定' ) wechatStatus
FROM
labor_group_dict t
LEFT JOIN group_member_mapping t2 ON t.id = t2.group_id
LEFT JOIN member t3 ON t2.member_id = t3.id
WHERE
t.delete_date IS NULL
AND t2.delete_date IS NULL
AND t3.delete_date IS NULL
<if test="laborId != null and laborId != ''">
AND t.labor_id = #{laborId}
</if>
<if test="userName != null and userName != ''" >
and t3.user_name like concat('%',#{userName} ,'%')
</if>
and t2.id is not null
</select>
</mapper>
......@@ -2,38 +2,36 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.subsidy.mapper.MemberMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.subsidy.model.MemberDO">
<id column="id" property="id" />
<result column="create_date" property="createDate" />
<result column="update_date" property="updateDate" />
<result column="delete_date" property="deleteDate" />
<result column="user_name" property="userName" />
<result column="account_name" property="accountName" />
<result column="account_name_en" property="accountNameEn" />
<result column="email" property="email" />
<result column="work_no" property="workNo" />
<result column="induction_date" property="inductionDate" />
<result column="telephone" property="telephone" />
<result column="password" property="password" />
<result column="gender" property="gender" />
<result column="image" property="image" />
<result column="check_image" property="checkImage" />
<result column="check_time" property="checkTime" />
<result column="id_card" property="idCard" />
<result column="id_card_photo" property="idCardPhoto" />
<result column="status" property="status" />
<result column="first_login" property="firstLogin" />
<result column="qq_no" property="qqNo" />
<result column="wechat" property="wechat" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
create_date,
update_date,
delete_date,
id, user_name, account_name, account_name_en, email, work_no, induction_date, telephone, password, gender, image, check_image, check_time, id_card, id_card_photo, status, first_login, qq_no, wechat
</sql>
<select id="academyMembers" resultType="com.subsidy.vo.member.AcademyMembersVO">
SELECT
t.id,
t.user_name,
t.`status`,
t.account_name,
t.gender,
t.telephone,
t.id_card,
t.email,
t2.college,
t.major,
t.practice_status,
t.enrollment_year
FROM
member t
LEFT JOIN academy_college_dict t2 ON t.college_id = t2.id
WHERE
t.delete_date IS NULL
and t2.delete_date is null
<if test="practiceStatus != null and practiceStatus != ''">
AND t.practice_status = #{practiceStatus}
</if>
<if test="userName != null and userName != ''">
AND t.user_name like concat('%',#{userName} ,'%')
</if>
<if test="academyId != null and academyId != ''">
AND t.academy_id = #{academyId}
</if>
and t.member_type = 0
</select>
</mapper>
......@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.subsidy.mapper.ProductDictMapper">
<select id="allProducts" parameterType="string" resultType="com.subsidy.model.ProductDictDO">
<select id="allProducts" resultType="com.subsidy.model.ProductDictDO">
SELECT
*
FROM
......@@ -10,5 +10,12 @@
WHERE
t.delete_date IS NULL
AND t.product_name like concat('%',#{productName} ,'%')
and t.product_type = #{productType}
order by t.order_no
</select>
<update id="updateOrderNo">
update product_dict set order_no = #{orderNo} where id = #{id}
</update>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.subsidy.mapper.ProjectMemberMappingMapper">
<select id="detail" parameterType="long" resultType="com.subsidy.vo.member.DetailVO">
SELECT
t.id,
t2.project_name,
t.job_name,
ifnull( t.delete_date, t.create_date ) AS hireTime
FROM
project_member_mapping t
LEFT JOIN project t2 ON t.project_id = t2.id
WHERE
t2.delete_date IS NULL
AND t.member_id = #{memberId}
ORDER BY
ifnull( t.delete_date, t.create_date ) DESC
</select>
</mapper>
......@@ -9,13 +9,13 @@
service_company_files t
WHERE
t.delete_date IS NULL
<if test="serviceCompanyId != null and serviceCompanyId != ''">
AND t.service_company_id = #{serviceCompanyId}
</if>
<if test="fileName != null and fileName != ''">
AND t.file_name like concat('%',#{fileName} ,'%')
</if>
and t.file_type = #{fileType}
and t.tree_id in
<foreach collection="treeIds" item="id" index="index" open="(" close=")" separator=",">
#{id}
</foreach>
</select>
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.subsidy.mapper.ServiceFileTreeMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.subsidy.model.ServiceFileTreeDO">
<id column="id" property="id" />
<result column="create_date" property="createDate" />
<result column="update_date" property="updateDate" />
<result column="delete_date" property="deleteDate" />
<result column="company_id" property="companyId" />
<result column="parent_id" property="parentId" />
<result column="tree_name" property="treeName" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
create_date,
update_date,
delete_date,
id, company_id, parent_id, tree_name
</sql>
</mapper>
# 环境配置
spring.profiles.active=prod
# 环境配置 平台端
spring.profiles.active=dev
#和CPU数
spring.server.acceptorThreadCount=600
spring.server.minSpareThreads=100
......@@ -11,6 +11,10 @@ spring.server.connectionTimeout=20000
spring.server.protocol=org.apache.coyote.http11.Http11AprProtocol
spring.server.redirectPort=8443
spring.server.compression=on
#jmx配置
spring.jmx.enabled=true
spring.jmx.default-domain=116.62.57.92
spring.jmx.port=1099
#文件请求大小
spring.server.MaxFileSize=300MB
spring.server.MaxRequestSize=500MB
......@@ -78,3 +82,4 @@ polyv.userId=b8f2d3bfdc
polyv.appId=g3lrxnzd75
polyv.appSecret=ef9cdcbbb9184b61aca301ba8114d570
polyv.secretKey=03sqxr97fo
......@@ -23,6 +23,7 @@ meishu.code-message[10026]=姓名或身份证号格式不正确
meishu.code-message[10027]=该手机号已注册
meishu.code-message[10028]=该成员已在其他公司入职
meishu.code-message[10029]=密码输入错误
meishu.code-message[10030]=该院校已存在
meishu.code-message[20001]=该课程已存在
meishu.code-message[20002]=该成员已存在
......
......@@ -118,6 +118,18 @@
<if test="id !=null and id !=''">
and t.administer_id = #{id}
</if>
</select>
<select id="uniqueAdminister" parameterType="long" resultType="com.subsidy.model.AdministerDO">
SELECT
t.*
FROM
administer t
LEFT JOIN administer_company_mapping t2 ON t.id = t2.administer_id
WHERE
t.delete_date IS NULL
AND t2.delete_date IS NULL
AND t2.company_id = #{companyId}
AND t.role =3
</select>
</mapper>
......@@ -4,8 +4,13 @@
<select id="operators" resultType="com.subsidy.dto.company.OperatorsVO">
SELECT
distinct
t2.id as companyId,
t1.*,
t2.account_name,
t2.`password`
FROM
(
SELECT DISTINCT
t2.id AS companyId,
t2.banner,
t2.short_name,
t2.company_name,
......@@ -13,25 +18,37 @@
t2.address,
t2.supervise_name,
t2.company_code,
t2.area_name,
t4.password,
t4.account_name
t2.area_name
FROM
company_dict t2
left join company_field_mapping t3 on t2.id = t3.company_id
left join administer t4 on t2.id = t4.company_id and role = 3
LEFT JOIN company_field_mapping t3 ON t2.id = t3.company_id
WHERE
t2.delete_date is null
and t3.delete_date is null
t2.delete_date IS NULL
AND t3.delete_date IS NULL
<if test="companyName != null and companyName != ''">
and t2.company_name like concat('%',#{companyName} ,'%')
</if>
) t1
LEFT JOIN (
SELECT
t.company_id,
t2.account_name,
t2.`password`
FROM
administer_company_mapping t
LEFT JOIN administer t2 ON t.administer_id = t2.id
WHERE
t2.role = 3
and t.delete_date IS NULL
and t2.delete_date IS NULL
) t2 ON t1.companyId = t2.company_id
<if test="fieldId != null and fieldId != ''">
and t3.field_id = #{fieldId}
and t1.field_id = #{fieldId}
</if>
<if test="superviseName != null and superviseName != ''">
and t2.supervise_name =#{superviseName}
and t1.supervise_name =#{superviseName}
</if>
order by t1.companyId
</select>
......@@ -71,6 +88,7 @@
<if test="memberStatus == 0">
and ( t5.member_status = #{memberStatus} or t5.member_status is null)
</if>
and t.member_type = 2
</select>
</mapper>
......@@ -2,38 +2,36 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.subsidy.mapper.MemberMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.subsidy.model.MemberDO">
<id column="id" property="id" />
<result column="create_date" property="createDate" />
<result column="update_date" property="updateDate" />
<result column="delete_date" property="deleteDate" />
<result column="user_name" property="userName" />
<result column="account_name" property="accountName" />
<result column="account_name_en" property="accountNameEn" />
<result column="email" property="email" />
<result column="work_no" property="workNo" />
<result column="induction_date" property="inductionDate" />
<result column="telephone" property="telephone" />
<result column="password" property="password" />
<result column="gender" property="gender" />
<result column="image" property="image" />
<result column="check_image" property="checkImage" />
<result column="check_time" property="checkTime" />
<result column="id_card" property="idCard" />
<result column="id_card_photo" property="idCardPhoto" />
<result column="status" property="status" />
<result column="first_login" property="firstLogin" />
<result column="qq_no" property="qqNo" />
<result column="wechat" property="wechat" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
create_date,
update_date,
delete_date,
id, user_name, account_name, account_name_en, email, work_no, induction_date, telephone, password, gender, image, check_image, check_time, id_card, id_card_photo, status, first_login, qq_no, wechat
</sql>
<select id="academyMembers" resultType="com.subsidy.vo.member.AcademyMembersVO">
SELECT
t.id,
t.user_name,
t.`status`,
t.account_name,
t.gender,
t.telephone,
t.id_card,
t.email,
t2.college,
t.major,
t.practice_status,
t.enrollment_year
FROM
member t
LEFT JOIN academy_college_dict t2 ON t.college_id = t2.id
WHERE
t.delete_date IS NULL
and t2.delete_date is null
<if test="practiceStatus != null and practiceStatus != ''">
AND t.practice_status = #{practiceStatus}
</if>
<if test="userName != null and userName != ''">
AND t.user_name like concat('%',#{userName} ,'%')
</if>
<if test="academyId != null and academyId != ''">
AND t.academy_id = #{academyId}
</if>
and t.member_type = 0
</select>
</mapper>
......@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.subsidy.mapper.ProductDictMapper">
<select id="allProducts" parameterType="string" resultType="com.subsidy.model.ProductDictDO">
<select id="allProducts" resultType="com.subsidy.model.ProductDictDO">
SELECT
*
FROM
......@@ -10,5 +10,12 @@
WHERE
t.delete_date IS NULL
AND t.product_name like concat('%',#{productName} ,'%')
and t.product_type = #{productType}
order by t.order_no
</select>
<update id="updateOrderNo">
update product_dict set order_no = #{orderNo} where id = #{id}
</update>
</mapper>
......@@ -9,13 +9,13 @@
service_company_files t
WHERE
t.delete_date IS NULL
<if test="serviceCompanyId != null and serviceCompanyId != ''">
AND t.service_company_id = #{serviceCompanyId}
</if>
<if test="fileName != null and fileName != ''">
AND t.file_name like concat('%',#{fileName} ,'%')
</if>
and t.file_type = #{fileType}
and t.tree_id in
<foreach collection="treeIds" item="id" index="index" open="(" close=")" separator=",">
#{id}
</foreach>
</select>
......
This file is too large to display.
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!