隐患排查综合管控系统
parent: d1e294 | patch | commitdiff
郑永安
2023-07-24 0645153dfa233b51a749db73f9bd5a8c5127c595
refs
author 郑永安 <zyazyz250@sina.com>
Monday, July 24, 2023 09:27 +0800
committer 郑永安 <zyazyz250@sina.com>
Monday, July 24, 2023 09:27 +0800
commit0645153dfa233b51a749db73f9bd5a8c5127c595
tree 89abdae9f4f5343c6a84f1b9a77ea5549667b603 tree | zip | gz
parent d1e2943f1efe6a1fcdcc12d463fd59466b94c1ba view | diff
ef406c4432c290f2627fa3742a1489e660dcc239 view | diff 
Merge branch 'master' of
https://sinanoaq.cn:8888/r/hazardInvestigationSystem.git

Conflicts:
	src/main/java/com/gk/hotwork/Mapper/SafetySelfInspectionMapper.java
28 files modified
27 files added
2550 ■■■■■ changed files
src/main/java/com/gk/hotwork/Controller/Base/BaseController.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Controller/InspectionExpertController.java 86 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Controller/InspectionExpertcGroupController.java 57 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Controller/InspectionHiddenDangerController.java 104 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Controller/SafetyInspectionItemController.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Controller/SafetySelfInspectionController.java 52 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Controller/UserController.java 39 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Domain/ElementTree.java 11 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Domain/InspectionExpert.java 57 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Domain/InspectionExpertGroup.java 54 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Domain/InspectionHiddenDanger.java 77 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Domain/SafetyInspectionElementA.java 24 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Domain/SafetySelfInspection.java 101 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Domain/SafetySelfInspectionItem.java 50 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Domain/Vo/UserVo.java 34 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Domain/dto/resp/InspectionHiddenDangerRespDTO.java 32 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Domain/dto/resp/SafetyInspectionElementRespDTO.java 29 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Domain/dto/resp/SafetySelfInspectionElementRespDTO.java 34 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Domain/dto/resp/SafetySelfInspectionRespDTO.java 84 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Domain/query/CompanyQuery.java 28 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Domain/query/InspectionQuery.java 37 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Mapper/CompanyInfoMapper.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Mapper/InspectionExpertGroupMapper.java 22 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Mapper/InspectionExpertMapper.java 16 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Mapper/InspectionHiddenDangerMapper.java 29 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Mapper/SafetyInspectionElementAMapper.java 16 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Mapper/SafetySelfInspectionItemMapper.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Mapper/SafetySelfInspectionMapper.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Mapper/UserInfoMapper.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Mapper/mybatis/CompanyInfoMapper.xml 32 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Mapper/mybatis/ElementManagementMapper.xml 42 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Mapper/mybatis/InspectionExpertGroupMapper.xml 43 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Mapper/mybatis/InspectionHiddenDangerMapper.xml 83 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Mapper/mybatis/SafetySelfInspectionItemMapper.xml 26 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Mapper/mybatis/SafetySelfInspectionMapper.xml 10 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Mapper/mybatis/UserInfoMapper.xml 25 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Service/CompanyService.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Service/ElementManagementService.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Service/InspectionExpertGroupService.java 22 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Service/InspectionExpertService.java 21 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Service/InspectionHiddenDangerService.java 33 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Service/SafetyInspectionElementAService.java 17 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Service/SafetyInspectionItemService.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Service/SafetySelfInspectionService.java 15 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Service/ServiceImpl/CompanyServiceImpl.java 28 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Service/ServiceImpl/ElementManagementImpl.java 62 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Service/ServiceImpl/InspectionExpertGroupServiceImpl.java 59 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Service/ServiceImpl/InspectionExpertServiceImpl.java 92 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Service/ServiceImpl/InspectionHiddenDangerServiceImpl.java 170 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetyInspectionElementAServiceImpl.java 32 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetyInspectionItemImpl.java 79 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetySelfInspectionImpl.java 546 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Service/ServiceImpl/UserServiceImpl.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/gk/hotwork/Service/UserService.java 2 ●●●●● diff | view | raw | blame | history
src/main/resources/application.yml 2 ●●●●● diff | view | raw | blame | history