forked from moral

parent: ff3af3 | patch | commitdiff
cjl
2023-09-26 346288bc38bdab442721d7609caed86d03b9d2d4
refs
author cjl <276999030@qq.com>
Tuesday, September 26, 2023 19:25 +0800
committer cjl <276999030@qq.com>
Tuesday, September 26, 2023 19:25 +0800
commit346288bc38bdab442721d7609caed86d03b9d2d4
tree 31049ae3dfc39990463125948e7dfc3bc35eb635 tree | zip | gz
parent ff3af3a0dd0fe87a500c13e933bea1f553083508 view | diff
c0c80bebcc93e90834e06404d6056322e51b02dd view | diff 
Merge remote-tracking branch 'origin/wb' into qa

# Conflicts:
#	screen-api/pom.xml
79 files added
19 files modified
6888 ■■■■■ changed files
screen-api/pom.xml 15 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/Swagger2.java 15 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/config/Interceptor/UserHelper.java 49 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/config/mybatis/MybatisPlusConfig.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/config/mybatis/PlusConfig.java 125 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/AllocationController.java 239 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/AllocationExtensionController.java 64 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/DictController.java 8 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/FileTableController.java 64 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/entity/Allocation.java 140 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/entity/AllocationExtension.java 56 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/entity/ApproveTable.java 52 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/entity/FileTable.java 92 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/entity/ResponsibilityUnit.java 55 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/entity/User.java 7 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java 18 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/AllocationExtensionMapper.java 37 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/AllocationMapper.java 33 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/ApproveTableMapper.java 8 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/FileTableMapper.java 16 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/ResponsibilityUnitMapper.java 8 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/bean/BaseCreateEntity.java 53 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/bean/BaseDelEntity.java 33 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/bean/BaseEntity.java 13 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/bean/BaseInvalidEntity.java 31 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/bean/BaseUpdateEntity.java 53 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/dto/allocation/AllocationUnitDto.java 153 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/dto/allocation/AllocationUnitViewDto.java 46 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/enums/AllocationApproveEnum.java 10 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/enums/AllocationEscalationTypeEnum.java 59 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/enums/AllocationExtensionApproveEnum.java 68 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/enums/FileTableEnum.java 68 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/enums/FileType.java 69 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/enums/StateEnum.java 4 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/enums/YesOrNo.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationExt.java 37 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationListExt.java 22 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java 24 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/ext/allocationextension/AllocationExtensionExt.java 69 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/ext/allocationextension/AllocationExtensionListExt.java 22 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/ext/allocationextension/AllocationExtensionPageExt.java 40 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/query/OrderByItem.java 41 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/query/OrderType.java 55 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/query/PageCond.java 44 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationAddCond.java 77 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationChangeCond.java 58 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationCheckCond.java 53 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationListCond.java 37 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationPageCond.java 54 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationUpdateCond.java 85 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/query/allocationextension/AllocationExtensionAddCond.java 51 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/query/allocationextension/AllocationExtensionListCond.java 28 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/query/allocationextension/AllocationExtensionPageCond.java 49 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/query/allocationextension/AllocationExtensionUpdateCond.java 76 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/query/approvetable/ApproveTableAddCond.java 70 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/query/approvetable/ApproveTableListCond.java 28 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/query/approvetable/ApproveTablePageCond.java 31 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/query/approvetable/ApproveTableUpdateCond.java 70 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/vo/DictionaryVo.java 15 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java 122 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java 144 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/vo/allocationextension/AllocationExtensionListVo.java 83 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/vo/allocationextension/AllocationExtensionPageVo.java 96 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/vo/allocationextension/AllocationExtensionVo.java 122 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/vo/approvetable/ApproveTableListVo.java 47 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/vo/file/FileVo.java 29 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/vo/user/QxUser.java 34 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/AllocationExtensionService.java 44 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/AllocationService.java 63 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/ApproveTableService.java 29 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/FileTableService.java 33 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/ResponsibilityUnitService.java 27 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/AllocationExtensionServiceImpl.java 93 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java 579 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/ApproveTableServiceImpl.java 50 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java 238 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java 53 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java 11 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/utils/FileTypeUtils.java 126 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/utils/StringUtils.java 1175 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/application-dev.yml 6 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/application-local.yml 12 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/application-qa.yml 5 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml 69 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/AllocationMapper.xml 96 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/FileTableMapper.xml 20 ●●●●● diff | view | raw | blame | history
screen-common/src/main/java/com/moral/constant/Constants.java 7 ●●●●● diff | view | raw | blame | history
screen-common/src/main/java/com/moral/constant/PageInfo.java 27 ●●●●● diff | view | raw | blame | history
screen-common/src/main/java/com/moral/constant/PageResult.java 34 ●●●●● diff | view | raw | blame | history
screen-common/src/main/java/com/moral/constant/RedisConstants.java 3 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/controller/ResponsibilityUnitController.java 118 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/controller/SystemController.java 12 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/entity/ResponsibilityUnit.java 70 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/mapper/ResponsibilityUnitMapper.java 8 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/ResponsibilityUnitService.java 21 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/SysAreaService.java 11 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java 196 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/SysAreaServiceImpl.java 74 ●●●●● diff | view | raw | blame | history