parent: 7fdc6a | patch | commitdiff
jinpengyong
2023-09-26 b9086588c215b7493682d65d49ed1070d88c3058
refs
author jinpengyong <jpy123456>
Tuesday, September 26, 2023 15:49 +0800
committer jinpengyong <jpy123456>
Tuesday, September 26, 2023 15:49 +0800
commitb9086588c215b7493682d65d49ed1070d88c3058
tree cfdf4d9111f738455e931c19e2f07029dc9fcdc2 tree | zip | gz
parent 7fdc6aba000c90adcb1e70d170252f016a4f9694 view | diff
b96b8fceafe697d326cd0071504b0dfd19a9eb14 view | diff 
Merge remote-tracking branch 'origin/wb' into wb

# Conflicts:
#	screen-api/src/main/java/com/moral/api/controller/AllocationController.java
#	screen-api/src/main/java/com/moral/api/service/AllocationService.java
#	screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
48 files added
17 files modified
3312 ■■■■■ changed files
screen-api/pom.xml 9 ●●●●● 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 89 ●●●●● 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 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/entity/Allocation.java 27 ●●●●● 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 21 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java 16 ●●●●● 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 25 ●●●●● 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/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 5 ●●●●● 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 84 ●●●●● 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 11 ●●●●● 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/service/AllocationExtensionService.java 44 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/AllocationService.java 37 ●●●●● 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 4 ●●●●● 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 234 ●●●●● 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 49 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/application-qa.yml 1 ●●●●● 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-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